部门画像--能里画像--雷达图代码修改

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

@@ -376,14 +376,14 @@ public class DeptPortraitServiceImpl implements IDeptPortraitService {
     public List<StationTeamStatsDTO> getStationTeamStats(DeptPortraitQueryDTO query) {
         // 1. 验证是站级别
         SysDept station = sysDeptMapper.selectDeptById(query.getDeptId());
-        if (station == null || !"STATION".equals(station.getDeptType())) {
+        if (station == null) {
             throw new RuntimeException("请选择站级别部门");
         }
 
         // 2. 查询站下所有部门(BRIGADE)
         SysDept deptQuery = new SysDept();
         deptQuery.setParentId(query.getDeptId());
-        deptQuery.setDeptType(DeptTypeEnum.BRIGADE.getCode());
+        deptQuery.setDeptType(getChildDeptType(station.getDeptType()));
         deptQuery.setStatus("0");
         List<SysDept> brigades = sysDeptMapper.selectDeptList(deptQuery);
 
@@ -403,6 +403,23 @@ public class DeptPortraitServiceImpl implements IDeptPortraitService {
         return result;
     }
 
+    private String getChildDeptType(String deptType) {
+        if (deptType == null || deptType.isEmpty()) {
+            return null;
+        }
+
+        switch (deptType) {
+            case "STATION":
+                return DeptTypeEnum.BRIGADE.getCode();
+            case "BRIGADE":
+                return DeptTypeEnum.MANAGER.getCode();
+            case "MANAGER":
+                return DeptTypeEnum.TEAMS.getCode();
+            default:
+                return null;
+        }
+    }
+
     @Override
     public StationTeamStatsDTO getTeamStats(DeptPortraitQueryDTO query) {
         SysDept sysDept = sysDeptMapper.selectDeptById(query.getDeptId());

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

@@ -109,10 +109,11 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
         dims.sort(Comparator.comparing(d -> d.getSortOrder() == null ? 999 : d.getSortOrder()));
 
         List<GroupPortraitDTO.DimensionScore> result = new ArrayList<>();
-
+        String beginTime = query.getStartDate()+" 00:00:00";
+        String endTime = query.getEndDate()+" 23:59:59";
         for (ScoreDimension dim : dims) {
             // 3. 通过dimRelationship找到下级维度，计算下级平均值
-            BigDecimal lowerLevelAverage = calculateLowerLevelAverage(dim, query.getStartDate(), query.getEndDate());
+            BigDecimal lowerLevelAverage = calculateLowerLevelAverage(dim,beginTime , endTime,dept.getDeptId());
             
             // 4. 获取基础分（如果下级有值就不用基础分）
             BigDecimal baseScore = dim.getBaseScore() != null ? dim.getBaseScore() : BigDecimal.ZERO;
@@ -123,8 +124,8 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
                     : baseScore;
 
             // 6. 计算当前层级特有加减分
-            Map<String, Object> specialScores = calculateSpecialScores(dim.getId(), query.getDeptId(), 
-                    query.getStartDate(), query.getEndDate(),org);
+            Map<String, Object> specialScores = calculateSpecialScores(dim.getId(), query.getDeptId(),
+                    beginTime, endTime,org);
             BigDecimal addScore = (BigDecimal) specialScores.getOrDefault("add", BigDecimal.ZERO);
             BigDecimal subtractScore = (BigDecimal) specialScores.getOrDefault("subtract", BigDecimal.ZERO);
             BigDecimal specialTotal = addScore.subtract(subtractScore);
@@ -194,15 +195,15 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
     }
 
     /**
-     * 计算下级维度平均值（递归查找）
+     * 计算下级维度平均值
      * 层级关系：部门(DEPT) → 队/班组(TEAM) → 小组(GROUP) → 人员(PERSON)
      * 递进逻辑：
-     * - org=DEPT → 查询org=TEAM的维度 → 继续递归找org=GROUP → 继续递归找org=PERSON
-     * - org=TEAM → 查询org=GROUP的维度 → 继续递归找org=PERSON
+     * - org=DEPT → 获取子班组列表 → 计算每个班组的最终分数 → 求平均值
+     * - org=TEAM → 获取子小组列表 → 计算每个小组的最终分数 → 求平均值
      * - org=GROUP → 查询org=PERSON的维度 → 计算人员事件平均
      * - org=PERSON → 最底层，直接返回0
      */
-    private BigDecimal calculateLowerLevelAverage(ScoreDimension currentDim, String beginTime, String endTime) {
+    private BigDecimal calculateLowerLevelAverage(ScoreDimension currentDim, String beginTime, String endTime, Long deptId) {
         String dimRelationship = currentDim.getDimRelationship();
         String currentOrg = currentDim.getOrg();
         
@@ -217,7 +218,6 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
             return BigDecimal.ZERO;
         }
 
-        
         // 3. 查询下一级维度（通过dimRelationship匹配）
         ScoreDimension query = new ScoreDimension();
         query.setDimRelationship(dimRelationship);
@@ -236,19 +236,78 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
         // 4. 根据下一级的org决定如何处理
         if (ScoreLevelEnum.PERSON.getCode().equals(lowerOrg)) {
             // 下一级是人员维度，计算人员事件平均值
-            return calculatePersonDimensionAverage(lowerDim, beginTime, endTime);
+            return calculatePersonDimensionAverage(lowerDim, beginTime, endTime, deptId);
         } else {
-            // 下一级是组织维度(TEAM或GROUP)，需要继续递归查找更下一级
-            // 例如：部门(DEPT)找队(TEAM)，队(TEAM)还要继续找小组(GROUP)
-            return calculateLowerLevelAverage(lowerDim, beginTime, endTime);
+            // 下一级是 TEAM 或 GROUP 层级，需要获取子部门并计算每个子部门的最终分数
+            return calculateChildDeptAverage(lowerDim, beginTime, endTime, deptId);
         }
     }
 
     /**
+     * 计算子部门的平均分数
+     * 对于 TEAM 和 GROUP 层级，需要获取子部门列表，计算每个子部门的最终分数，然后求平均
+     */
+    private BigDecimal calculateChildDeptAverage(ScoreDimension lowerDim, String beginTime, String endTime, Long deptId) {
+        // 获取子部门列表
+        List<SysDept> childDepts = sysDeptMapper.selectChildrenDeptById(deptId);
+        
+        if (childDepts == null || childDepts.isEmpty()) {
+            log.info("部门 {} 没有子部门", deptId);
+            return BigDecimal.ZERO;
+        }
+
+        BigDecimal totalScore = BigDecimal.ZERO;
+        int count = 0;
+
+        for (SysDept childDept : childDepts) {
+            // 计算该子部门在当前维度下的最终分数
+            BigDecimal childScore = calculateChildDeptDimensionScore(lowerDim, beginTime, endTime, childDept.getDeptId());
+            if (childScore.compareTo(BigDecimal.ZERO) > 0) {
+                totalScore = totalScore.add(childScore);
+                count++;
+            }
+        }
+
+        if (count == 0) {
+            return BigDecimal.ZERO;
+        }
+
+        return totalScore.divide(BigDecimal.valueOf(count), 2, RoundingMode.HALF_UP);
+    }
+
+    /**
+     * 计算单个子部门在指定维度下的最终分数
+     * 最终分数 = 下级平均值(或基础分) + 特有加减分
+     */
+    private BigDecimal calculateChildDeptDimensionScore(ScoreDimension dim, String beginTime, String endTime, Long deptId) {
+        String currentOrg = dim.getOrg();
+        
+        // 1. 递归计算下级平均值
+        BigDecimal lowerLevelAverage = calculateLowerLevelAverage(dim, beginTime, endTime, deptId);
+        
+        // 2. 获取基础分（如果下级有值就不用基础分）
+        BigDecimal baseScore = dim.getBaseScore() != null ? dim.getBaseScore() : BigDecimal.ZERO;
+        
+        // 3. 决定使用下级平均值还是基础分
+        BigDecimal averageScore = lowerLevelAverage.compareTo(BigDecimal.ZERO) > 0 
+                ? lowerLevelAverage 
+                : baseScore;
+
+        // 4. 计算当前层级特有加减分
+        Map<String, Object> specialScores = calculateSpecialScores(dim.getId(), deptId, beginTime, endTime, currentOrg);
+        BigDecimal addScore = (BigDecimal) specialScores.getOrDefault("add", BigDecimal.ZERO);
+        BigDecimal subtractScore = (BigDecimal) specialScores.getOrDefault("subtract", BigDecimal.ZERO);
+        BigDecimal specialTotal = addScore.subtract(subtractScore);
+
+        // 5. 最终分值 = 下级平均值(或基础分) + 特有合计
+        return averageScore.add(specialTotal);
+    }
+
+    /**
      * 计算人员维度平均值
      * 最底层（org=4），查询该维度下的所有人员事件，计算平均分数
      */
-    private BigDecimal calculatePersonDimensionAverage(ScoreDimension dimension, String beginTime, String endTime) {
+    private BigDecimal calculatePersonDimensionAverage(ScoreDimension dimension, String beginTime, String endTime,Long deptId) {
 
         // 查询该维度下的所有事件
         ScoreEvent eventQuery = new ScoreEvent();
@@ -259,11 +318,13 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
         if (endTime != null && !endTime.isEmpty()) {
             eventQuery.getParams().put("endTime", endTime);
         }
+        eventQuery.setGroupId(deptId);
         List<ScoreEvent> events = scoreEventMapper.selectList(eventQuery);
 
+        BigDecimal base = dimension.getBaseScore() != null ? dimension.getBaseScore() : BigDecimal.valueOf(80);
         if (events == null || events.isEmpty()) {
             log.info("人员维度无事件数据");
-            return BigDecimal.ZERO;
+            return base;
         }
 
         // 按人员分组统计总分
@@ -286,14 +347,12 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
         if (personScores.isEmpty()) {
             return BigDecimal.ZERO;
         }
+        BigDecimal bigDecimal = BigDecimal.valueOf(personScores.size());
         BigDecimal sum = personScores.values().stream().reduce(BigDecimal.ZERO, BigDecimal::add);
 
-        BigDecimal base = dimension.getBaseScore() != null ? dimension.getBaseScore() : BigDecimal.valueOf(80);
-        BigDecimal dimScore = base.add(sum);
-        BigDecimal weight = dimension.getWeight() != null ? dimension.getWeight() : BigDecimal.ZERO;
-        BigDecimal contribution = dimScore.multiply(weight)
-                .divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
-        return contribution;
+
+        BigDecimal dimScore = base.multiply(bigDecimal).add(sum);
+        return dimScore.divide(bigDecimal, 2, RoundingMode.HALF_UP);
     }
 
     /**
@@ -328,7 +387,13 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
         // 查询该部门在该维度的特有事件（根据org参数筛选）
         ScoreEvent eventQuery = new ScoreEvent();
         eventQuery.setDimensionId(dimensionId);
-        eventQuery.setDeptId(deptId);
+        if(ScoreLevelEnum.GROUP.getCode().equals(org)){
+            eventQuery.setGroupId(deptId);
+        }else if(ScoreLevelEnum.TEAM.getCode().equals(org)){
+            eventQuery.setTeamId(deptId);
+        }else if(ScoreLevelEnum.DEPT.getCode().equals(org)){
+            eventQuery.setDeptId(deptId);
+        }
         eventQuery.setOrg(org); // 使用传入的org参数
         if (beginTime != null && !beginTime.isEmpty()) {
             eventQuery.getParams().put("beginTime", beginTime);
@@ -411,4 +476,4 @@ public class GroupPortraitServiceImpl implements IGroupPortraitService {
                 .reduce(BigDecimal.ZERO, BigDecimal::add);
         return total.setScale(2, RoundingMode.HALF_UP);
     }
-}
+}

airport-ledger/src/main/resources/mapper/ledger/ScoreDimensionMapper.xml

@@ -32,6 +32,7 @@
         <if test="name != null and name != ''">AND name LIKE CONCAT('%', #{name}, '%')</if>
         <if test="status != null and status != ''">AND status = #{status}</if>
         <if test="org != null and org != ''">AND org = #{org}</if>
+        <if test="dimRelationship != null and dimRelationship != ''">AND dim_relationship = #{dimRelationship}</if>
         ORDER BY sort_order ASC, id ASC
     </select>