非干部月度考核分数汇总

airport-admin/src/main/java/com/sundot/airport/web/controller/personnel/PersonnelNonCadreMonthlyAssessmentScoreSummaryController.java

@@ -216,7 +216,7 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
                     .filter(item -> deptIdList.contains(item.getBrigadeId()))
                     .collect(Collectors.toList());
             if (CollUtil.isEmpty(list)) {
-                return success(createEmptyScoreRangeDistribution());
+                return success(createEmptyScoreRangeDistribution(deptMap));
             }
             // 定义6个分数段
             String[] rangeKeys = {"below70", "70-75", "75-80", "80-85", "85-90", "above90"};
@@ -347,7 +347,7 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
     /**
      * 创建空的分值区间分布数据
      */
-    private List<ScoreRangeDistributionDto> createEmptyScoreRangeDistribution() {
+    private List<ScoreRangeDistributionDto> createEmptyScoreRangeDistribution(Map<Long, SysDept> deptMap) {
         List<ScoreRangeDistributionDto> result = new ArrayList<>();
         String[] rangeKeys = {"below70", "70-75", "75-80", "80-85", "85-90", "above90"};
         String[] rangeLabels = {"低于70", "[70-75)", "[75-80)", "[80-85)", "[85-90)", "90以上"};
@@ -357,9 +357,33 @@ public class PersonnelNonCadreMonthlyAssessmentScoreSummaryController extends Ba
             rangeDto.setRangeKey(rangeKeys[i]);
             rangeDto.setRangeLabel(rangeLabels[i]);
             rangeDto.setTotalCount(0);
-            rangeDto.setDeptCounts(Collections.emptyList());
+            List<ScoreRangeDistributionDto.DeptCountItemDto> deptCounts = new ArrayList<>();
+            deptMap.forEach((deptId, dept) -> {
+                ScoreRangeDistributionDto.DeptCountItemDto deptItem = new ScoreRangeDistributionDto.DeptCountItemDto();
+                deptItem.setDeptId(deptId);
+                deptItem.setDeptName(dept.getDeptName());
+                deptItem.setCount(0);
+                deptCounts.add(deptItem);
+            });
+            deptCounts.sort(Comparator.comparing(ScoreRangeDistributionDto.DeptCountItemDto::getDeptId));
+            rangeDto.setDeptCounts(deptCounts);
             result.add(rangeDto);
         }
+        ScoreRangeDistributionDto rangeTotalDto = new ScoreRangeDistributionDto();
+        rangeTotalDto.setRangeKey("小计");
+        rangeTotalDto.setRangeLabel("小计");
+        rangeTotalDto.setTotalCount(0);
+        List<ScoreRangeDistributionDto.DeptCountItemDto> deptCountTotals = new ArrayList<>();
+        deptMap.forEach((deptId, dept) -> {
+            ScoreRangeDistributionDto.DeptCountItemDto deptItem = new ScoreRangeDistributionDto.DeptCountItemDto();
+            deptItem.setDeptId(deptId);
+            deptItem.setDeptName(dept.getDeptName());
+            deptItem.setCount(0);
+            deptCountTotals.add(deptItem);
+        });
+        deptCountTotals.sort(Comparator.comparing(ScoreRangeDistributionDto.DeptCountItemDto::getDeptId));
+        rangeTotalDto.setDeptCounts(deptCountTotals);
+        result.add(rangeTotalDto);
         return result;
     }