Merge remote-tracking branch 'origin/dev_evaluate_add_20210510' into dev_temp

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<Projec
                     groupByProject.forEach((projectId,list) -> {
                         if (p.getProjectId().equals(projectId)){
                             Map<String, List<ProjectEvaluateDetailResultDTO>> 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());
                         }
                     });
                 }