diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/Impl/DataAnalysisServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/Impl/DataAnalysisServiceImpl.java index f995053c..e701382e 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/Impl/DataAnalysisServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/dataAnalysis/Impl/DataAnalysisServiceImpl.java @@ -134,7 +134,7 @@ public class DataAnalysisServiceImpl implements DataAnalysisService { @Override public List> userAndTaskCountList(String city) { - DataAnalysisResp dataAnalysisResp = getUserAndTaskDataCount(city); + DataAnalysisResp data = getUserAndTaskDataCount(city); List> res = new ArrayList<>(); Map respMap = new HashMap<>(); List list = vulInfoDao.selectList(); @@ -144,9 +144,9 @@ public class DataAnalysisServiceImpl implements DataAnalysisService { map.entrySet().forEach(p->{ String key = p.getKey(); Long perilousVulSUM = perilous.get(key); - dataAnalysisResp.setVulSUM(p.getValue().toString()); - dataAnalysisResp.setPerilousVulSUM(perilousVulSUM==null?"0":perilousVulSUM.toString()); - respMap.put(key, dataAnalysisResp); + DataAnalysisResp analysisResp = DataAnalysisResp.builder().scanVulSUM(data.getScanVulSUM()).useUserSUM(data.getUseUserSUM()).taskSUM(data.getTaskSUM()) + .vulSUM(p.getValue().toString()).perilousVulSUM(perilousVulSUM == null ? "0" : perilousVulSUM.toString()).build(); + respMap.put(key, analysisResp); }); res.add(respMap); return res;