From bfae3fabdf89c7bc28fc17ce5b0811986157dbc2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 May 2021 09:44:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ID=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectSatisfactionDetailServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java index 44ad6a4172..5b4e0794ba 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java @@ -287,7 +287,7 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl needAdd = new ArrayList<>(); if (!CollectionUtils.isEmpty(projects)){ - List projectIds = projects.stream().map(m -> m.getIssueId()).collect(Collectors.toList()); + List projectIds = projects.stream().map(m -> m.getProjectId()).collect(Collectors.toList()); List projectEvaluateDetailResult = baseDao.selectProjectEvaluateDetail(projectIds); Map> groupByProject = projectEvaluateDetailResult.stream().collect(Collectors.groupingBy(ProjectEvaluateDetailResultDTO::getProjectId)); boolean empty = groupByProject.isEmpty(); From 2c776eb4094ff8e643e285251a72b71c4170b711 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 May 2021 10:06:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=8D=E5=85=A8=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectSatisfactionDetailServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java index 5b4e0794ba..4c9d8b3724 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java @@ -270,9 +270,11 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl existsProjects = statisticsDao.selectExistsProject(); List projects = new ArrayList<>(); + // 要是 评价统计库没有记录，所有的项目都得插入 if (CollectionUtils.isEmpty(existsProjects)){ projects = allProjects; }else { + // 把 评价统计库存在的 标记为true， allProjects.forEach(a -> { existsProjects.forEach(p -> { if (a.getProjectId().equals(p)){ @@ -288,11 +290,14 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl needAdd = new ArrayList<>(); if (!CollectionUtils.isEmpty(projects)){ List projectIds = projects.stream().map(m -> m.getProjectId()).collect(Collectors.toList()); + List issueIds = projects.stream().map(m -> m.getIssueId()).collect(Collectors.toList()); + // 根据项目ID查询 项目的评价细节 List projectEvaluateDetailResult = baseDao.selectProjectEvaluateDetail(projectIds); + // 根据项目ID分组 Map> groupByProject = projectEvaluateDetailResult.stream().collect(Collectors.groupingBy(ProjectEvaluateDetailResultDTO::getProjectId)); boolean empty = groupByProject.isEmpty(); // 项目应评价人数 = 话题创建者 + 议题发起者 + 议题表决人 【去重】 - Result> canEvaluateProjectCountBatch = govIssueOpenFeignClient.canEvaluateProjectCountBatch(projectIds); + Result> canEvaluateProjectCountBatch = govIssueOpenFeignClient.canEvaluateProjectCountBatch(issueIds); if (!canEvaluateProjectCountBatch.success()){ throw new RenException("【查询项目应评价人数失败】，【"+canEvaluateProjectCountBatch.getMsg()+"】"); } From e4ac157a74a05b69cd1f194611188115fb9aea3e Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 18 May 2021 10:17:19 +0800 Subject: [PATCH 3/3] emm bug --- .../service/impl/ProjectSatisfactionDetailServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java index 4c9d8b3724..acc06b2281 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionDetailServiceImpl.java @@ -309,9 +309,9 @@ public class ProjectSatisfactionDetailServiceImpl extends BaseServiceImpl { if (p.getProjectId().equals(projectId)){ Map> groupByS = list.stream().collect(Collectors.groupingBy(ProjectEvaluateDetailResultDTO::getSatisfaction)); - e.setBadCount(groupByS.get(ProjectConstant.EVALUATE_BAD).size()); - e.setGoodCount(groupByS.get(ProjectConstant.EVALUATE_GOOD).size()); - e.setPerfectCount(groupByS.get(ProjectConstant.EVALUATE_PERFECT).size()); + e.setBadCount(CollectionUtils.isEmpty(groupByS.get(ProjectConstant.EVALUATE_BAD)) ? NumConstant.ZERO : groupByS.get(ProjectConstant.EVALUATE_BAD).size()); + e.setGoodCount(CollectionUtils.isEmpty(groupByS.get(ProjectConstant.EVALUATE_GOOD)) ? NumConstant.ZERO : groupByS.get(ProjectConstant.EVALUATE_GOOD).size()); + e.setPerfectCount(CollectionUtils.isEmpty(groupByS.get(ProjectConstant.EVALUATE_PERFECT)) ? NumConstant.ZERO : groupByS.get(ProjectConstant.EVALUATE_PERFECT).size()); } }); }