能力画像

airport-ledger/src/main/java/com/sundot/airport/ledger/dto/GroupPortraitDTO.java

@@ -104,5 +104,53 @@ public class GroupPortraitDTO implements Serializable {
          * 贡献分值（最终分值*权重/100）
          */
         private BigDecimal contribution;
+
+        /**
+         * 特有加减分明细列表
+         */
+        private List<SpecialDetail> specialDetails;
+    }
+
+    /**
+     * 特有加减分明细项
+     */
+    @Data
+    public static class SpecialDetail implements Serializable {
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 二级指标
+         */
+        private String level2Name;
+
+        /**
+         * 三级指标
+         */
+        private String level3Name;
+
+        /**
+         * 四级指标
+         */
+        private String level4Name;
+
+        /**
+         * 分值（正数为加分，负数为减分）
+         */
+        private BigDecimal score;
+
+        /**
+         * 事件描述
+         */
+        private String eventDesc;
+
+        /**
+         * 事件时间
+         */
+        private String eventTime;
+
+        /**
+         * 类型（加分/减分）
+         */
+        private String type;
     }
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/impl/GroupPortraitServiceImpl.java

@@ -117,11 +117,16 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
                     : baseScore;
 
             // 6. 计算当前层级特有加减分
-            Map<String, BigDecimal> specialScores = calculateSpecialScores(dim.getId(), query.getDeptId(), 
+            Map<String, Object> specialScores = calculateSpecialScores(dim.getId(), query.getDeptId(), 
                     query.getStartDate(), query.getEndDate(),org);
-            BigDecimal addScore = specialScores.getOrDefault("add", BigDecimal.ZERO);
-            BigDecimal subtractScore = specialScores.getOrDefault("subtract", BigDecimal.ZERO);
+            BigDecimal addScore = (BigDecimal) specialScores.getOrDefault("add", BigDecimal.ZERO);
+            BigDecimal subtractScore = (BigDecimal) specialScores.getOrDefault("subtract", BigDecimal.ZERO);
             BigDecimal specialTotal = addScore.subtract(subtractScore);
+            
+            // 获取特有条目明细
+            @SuppressWarnings("unchecked")
+            List<GroupPortraitDTO.SpecialDetail> specialDetails = 
+                    (List<GroupPortraitDTO.SpecialDetail>) specialScores.getOrDefault("details", new ArrayList<>());
 
             // 7. 最终分值 = 下级平均值(或基础分) + 特有合计
             BigDecimal finalScore = averageScore.add(specialTotal);
@@ -142,6 +147,7 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
             item.setFinalScore(finalScore.setScale(2, RoundingMode.HALF_UP));
             item.setWeight(weight);
             item.setContribution(contribution);
+            item.setSpecialDetails(specialDetails);
 
             result.add(item);
         }
@@ -296,13 +302,14 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
     }
 
     /**
-     * 计算小组特有加减分
+     * 计算小组特有加减分及明细
      * 注：小组特有事件通过org=1(部门级别)筛选
      */
-    private Map<String, BigDecimal> calculateSpecialScores(Long dimensionId, Long deptId, String beginTime, String endTime,String org) {
-        Map<String, BigDecimal> result = new HashMap<>();
+    private Map<String, Object> calculateSpecialScores(Long dimensionId, Long deptId, String beginTime, String endTime,String org) {
+        Map<String, Object> result = new HashMap<>();
         result.put("add", BigDecimal.ZERO);
         result.put("subtract", BigDecimal.ZERO);
+        result.put("details", new ArrayList<GroupPortraitDTO.SpecialDetail>());
 
         // 查询该部门在该维度的特有事件（org=1表示部门级）
         ScoreEvent eventQuery = new ScoreEvent();
@@ -317,6 +324,8 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
         }
         List<ScoreEvent> events = scoreEventMapper.selectList(eventQuery);
 
+        List<GroupPortraitDTO.SpecialDetail> details = new ArrayList<>();
+        
         if (events == null || events.isEmpty()) {
             return result;
         }
@@ -324,23 +333,62 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
         // 分别累计加分和减分
         BigDecimal addTotal = BigDecimal.ZERO;
         BigDecimal subtractTotal = BigDecimal.ZERO;
+        
+        // 使用Map按指标汇总：key为"二级_三级_四级"，value为明细对象
+        Map<String, GroupPortraitDTO.SpecialDetail> summaryMap = new LinkedHashMap<>();
 
         for (ScoreEvent e : events) {
             BigDecimal score = e.getTotalScore() != null ? e.getTotalScore() : BigDecimal.ZERO;
+            
+            // 构建汇总key：二级+三级+四级指标名称
+            String summaryKey = buildSummaryKey(e.getLevel2Name(), e.getLevel3Name(), e.getLevel4Name());
+            
+            // 如果该指标已存在，则累加分值
+            if (summaryMap.containsKey(summaryKey)) {
+                GroupPortraitDTO.SpecialDetail existingDetail = summaryMap.get(summaryKey);
+                BigDecimal newScore = existingDetail.getScore().add(score);
+                existingDetail.setScore(newScore);
+                // 更新类型（如果分值变号）
+                existingDetail.setType(newScore.compareTo(BigDecimal.ZERO) >= 0 ? "加分" : "减分");
+            } else {
+                // 组装明细项
+                GroupPortraitDTO.SpecialDetail detail = new GroupPortraitDTO.SpecialDetail();
+                detail.setLevel2Name(e.getLevel2Name());
+                detail.setLevel3Name(e.getLevel3Name());
+                detail.setLevel4Name(e.getLevel4Name());
+                detail.setScore(score);
+                detail.setEventDesc(e.getEventDesc());
+                detail.setType(score.compareTo(BigDecimal.ZERO) >= 0 ? "加分" : "减分");
+                summaryMap.put(summaryKey, detail);
+            }
+            
             if (score.compareTo(BigDecimal.ZERO) > 0) {
                 addTotal = addTotal.add(score);
             } else {
                 subtractTotal = subtractTotal.add(score.abs());
             }
         }
+        
+        // 将汇总后的明细转换为List
+        details.addAll(summaryMap.values());
 
         result.put("add", addTotal);
         result.put("subtract", subtractTotal);
+        result.put("details", details);
 
         return result;
     }
 
     /**
+     * 构建汇总key：二级+三级+四级指标名称
+     */
+    private String buildSummaryKey(String level2Name, String level3Name, String level4Name) {
+        return (level2Name != null ? level2Name : "") + "_" +
+               (level3Name != null ? level3Name : "") + "_" +
+               (level4Name != null ? level4Name : "");
+    }
+
+    /**
      * 计算综合评分（各维度贡献分值之和）
      */
     private BigDecimal calculateTotalScore(List<GroupPortraitDTO.DimensionScore> dimensions) {