预警-员工维度明细

airport-admin/src/main/java/com/sundot/airport/web/controller/ledger/LedgerWarningController.java

@@ -3,6 +3,7 @@ package com.sundot.airport.web.controller.ledger;
 import com.sundot.airport.common.core.controller.BaseController;
 import com.sundot.airport.common.core.domain.AjaxResult;
 import com.sundot.airport.common.dto.LedgerCommonQueryReqVO;
+import com.sundot.airport.ledger.domain.vo.EmployeeDimensionScoreVO;
 import com.sundot.airport.ledger.domain.vo.LedgerWarningDetailItemReduceVO;
 import com.sundot.airport.ledger.domain.vo.LedgerWarningDetailVO;
 import com.sundot.airport.ledger.domain.vo.LedgerWarningVO;
@@ -52,4 +53,15 @@ public class LedgerWarningController extends BaseController {
         return AjaxResult.success(result);
     }
 
+    /**
+     * 员工维度评分明细
+     * 获取指定条件下，相关人员在六个维度下的维度分值和相关信息
+     * 数据来源：从event表计算数据
+     */
+    @PostMapping("/employeeDimensionScores")
+    public AjaxResult getEmployeeDimensionScores(@RequestBody LedgerCommonQueryReqVO queryReq) {
+        List<EmployeeDimensionScoreVO> result = ledgerWarningService.getEmployeeDimensionScores(queryReq);
+        return AjaxResult.success(result);
+    }
+
 }

airport-common/src/main/java/com/sundot/airport/common/dto/LedgerCommonQueryReqVO.java

@@ -35,6 +35,11 @@ public class LedgerCommonQueryReqVO implements Serializable {
     private Long userId;
 
     /**
+     * 维度ID（可选，用于筛选特定维度）
+     */
+    private Long dimensionId;
+
+    /**
      * 开始时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd")

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/vo/EmployeeDimensionScoreVO.java

@@ -0,0 +1,66 @@
+package com.sundot.airport.ledger.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * 员工维度评分明细 VO
+ */
+@Data
+public class EmployeeDimensionScoreVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 员工ID
+     */
+    private Long userId;
+
+    /**
+     * 姓名
+     */
+    private String personName;
+
+    /**
+     * 部门
+     */
+    private String deptName;
+
+    /**
+     * 班组
+     */
+    private String teamName;
+
+    /**
+     * 小组
+     */
+    private String groupName;
+
+    /**
+     * 维度名称
+     */
+    private String dimensionName;
+
+    /**
+     * 维度分值
+     */
+    private BigDecimal dimensionScore;
+
+    /**
+     * 基础分
+     */
+    private BigDecimal baseScore;
+
+    /**
+     * 事件加减分合计
+     */
+    private BigDecimal eventScore;
+
+    /**
+     * 权重(%)
+     */
+    private BigDecimal weight;
+
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/mapper/LedgerWarningMapper.java

@@ -60,6 +60,6 @@ public interface LedgerWarningMapper {
     /**
      * 配分事项列表
      */
-    List<ScoreEvent> selectScoreEventList(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("scoreIndicatorIdList") List<Long> scoreIndicatorIdList, @Param("userIdList") List<Long> userIdList);
+    List<ScoreEvent> selectScoreEventList(@Param("startDate") Date startDate, @Param("endDate") Date endDate, @Param("scoreIndicatorIdList") List<Long> scoreIndicatorIdList, @Param("userIdList") List<Long> userIdList, @Param("dimensionIdList") List<Long> dimensionIdList);
 
 }

airport-ledger/src/main/java/com/sundot/airport/ledger/service/ILedgerWarningService.java

@@ -1,6 +1,7 @@
 package com.sundot.airport.ledger.service;
 
 import com.sundot.airport.common.dto.LedgerCommonQueryReqVO;
+import com.sundot.airport.ledger.domain.vo.EmployeeDimensionScoreVO;
 import com.sundot.airport.ledger.domain.vo.LedgerWarningDetailItemReduceVO;
 import com.sundot.airport.ledger.domain.vo.LedgerWarningDetailVO;
 import com.sundot.airport.ledger.domain.vo.LedgerWarningVO;
@@ -27,4 +28,10 @@ public interface ILedgerWarningService {
      */
     List<LedgerWarningDetailItemReduceVO> ledgerReduceDetail(LedgerCommonQueryReqVO queryReq);
 
+    /**
+     * 员工维度评分明细
+     * 从event表计算指定条件下，相关人员在六个维度下的维度分值和相关信息
+     */
+    List<EmployeeDimensionScoreVO> getEmployeeDimensionScores(LedgerCommonQueryReqVO queryReq);
+
 }

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

@@ -15,13 +15,16 @@ import com.sundot.airport.common.utils.DateMonthUtils;
 import com.sundot.airport.common.utils.DeptUtils;
 import com.sundot.airport.common.utils.SecurityUtils;
 import com.sundot.airport.common.utils.StreamSortUtils;
+import com.sundot.airport.ledger.domain.ScoreDimension;
 import com.sundot.airport.ledger.domain.ScoreEvent;
 import com.sundot.airport.ledger.domain.ScoreIndicator;
+import com.sundot.airport.ledger.domain.vo.EmployeeDimensionScoreVO;
 import com.sundot.airport.ledger.domain.vo.LedgerWarningDetailItemReduceVO;
 import com.sundot.airport.ledger.domain.vo.LedgerWarningDetailItemVO;
 import com.sundot.airport.ledger.domain.vo.LedgerWarningDetailVO;
 import com.sundot.airport.ledger.domain.vo.LedgerWarningVO;
 import com.sundot.airport.ledger.mapper.LedgerWarningMapper;
+import com.sundot.airport.ledger.mapper.ScoreDimensionMapper;
 import com.sundot.airport.ledger.service.IEmployeePortraitService;
 import com.sundot.airport.ledger.service.ILedgerWarningService;
 import com.sundot.airport.ledger.service.IScoreIndicatorService;
@@ -63,6 +66,9 @@ public class LedgerWarningServiceImpl implements ILedgerWarningService {
     @Autowired
     private ISysUserService sysUserService;
 
+    @Autowired
+    private ScoreDimensionMapper scoreDimensionMapper;
+
     /**
      * 台账数据
      */
@@ -131,7 +137,7 @@ public class LedgerWarningServiceImpl implements ILedgerWarningService {
             sysUserMap.putAll(sysUserList.stream().collect(Collectors.toMap(SysUser::getUserId, user -> user)));
         }
         Map<String, BigDecimal> overallScoreMap = employeePortraitService.getPortraitTotalScore(userNameList, DateUtil.formatDate(queryReq.getStartDate()), DateUtil.formatDate(queryReq.getEndDate()));
-        List<ScoreEvent> scoreEventList = ledgerWarningMapper.selectScoreEventList(queryReq.getStartDate(), queryReq.getEndDate(), scoreIndicatorIdList, userIdList);
+        List<ScoreEvent> scoreEventList = ledgerWarningMapper.selectScoreEventList(queryReq.getStartDate(), queryReq.getEndDate(), scoreIndicatorIdList, userIdList,null);
 //        // 由于person_name存在多用户时person_id为空,因此不能根据person_id进行分组处理数据
 //        Map<Long, List<ScoreEvent>> scoreEventMap = scoreEventList.stream().collect(Collectors.groupingBy(ScoreEvent::getPersonId));
         List<LedgerWarningDetailItemVO> ledgerWarningDetailItemList = new ArrayList<>();
@@ -311,7 +317,7 @@ public class LedgerWarningServiceImpl implements ILedgerWarningService {
             userNameList.addAll(sysUserList.stream().map(SysUser::getNickName).collect(Collectors.toList()));
             sysUserMap.putAll(sysUserList.stream().collect(Collectors.toMap(SysUser::getUserId, user -> user)));
         }
-        List<ScoreEvent> scoreEventList = ledgerWarningMapper.selectScoreEventList(queryReq.getStartDate(), queryReq.getEndDate(), scoreIndicatorIdList, userIdList);
+        List<ScoreEvent> scoreEventList = ledgerWarningMapper.selectScoreEventList(queryReq.getStartDate(), queryReq.getEndDate(), scoreIndicatorIdList, userIdList,null);
 //        // 由于person_name存在多用户时person_id为空,因此不能根据person_id进行分组处理数据
 //        Map<Long, List<ScoreEvent>> scoreEventMap = scoreEventList.stream().collect(Collectors.groupingBy(ScoreEvent::getPersonId));
         List<LedgerWarningDetailItemReduceVO> resultList = new ArrayList<>();
@@ -378,4 +384,220 @@ public class LedgerWarningServiceImpl implements ILedgerWarningService {
         return result;
     }
 
+    /**
+     * 员工维度评分明细（
+     * 从event表计算指定条件下，相关人员在六个维度下的维度分值和相关信息
+     */
+    @Override
+    public List<EmployeeDimensionScoreVO> getEmployeeDimensionScores(LedgerCommonQueryReqVO queryReq) {
+        // 1. 预加载基础数据
+        Long topSiteId = DeptUtils.getTopSiteId(sysDeptService.selectDeptById(SecurityUtils.getDeptId()));
+        Map<Long, SysDept> allDeptMap = sysDeptService.selectDeptInfoAll(new SysDept()).stream()
+                .collect(Collectors.toMap(SysDept::getDeptId, dept -> dept, (v1, v2) -> v1));
+        Map<Long, Set<Long>> brigadeSubDeptsMap = buildBrigadeSubDeptsMap(allDeptMap);
+
+        // 2. 确定需要查询的用户列表
+        List<Long> userIdList = new ArrayList<>();
+        Map<Long, SysUser> sysUserMap = new HashMap<>();
+        
+        if (ObjUtil.isNotNull(queryReq.getUserId())) {
+            // 指定单个用户
+            SysUser sysUser = sysUserService.selectUserById(queryReq.getUserId());
+            if (sysUser != null) {
+                userIdList.add(sysUser.getUserId());
+                sysUserMap.put(sysUser.getUserId(), sysUser);
+            }
+        } else {
+            // 根据组织架构获取用户列表
+            Long targetDeptId = ObjUtil.isNotNull(queryReq.getGroupId()) ? queryReq.getGroupId()
+                    : ObjUtil.isNotNull(queryReq.getTeamId()) ? queryReq.getTeamId()
+                    : ObjUtil.isNotNull(queryReq.getDeptId()) ? queryReq.getDeptId()
+                    : topSiteId;
+            List<SysUser> sysUserList = sysUserService.selectUserByDeptId(targetDeptId);
+            if (CollUtil.isNotEmpty(sysUserList)) {
+                userIdList = sysUserList.stream().map(SysUser::getUserId).collect(Collectors.toList());
+                sysUserMap = sysUserList.stream().collect(Collectors.toMap(SysUser::getUserId, user -> user));
+            }
+        }
+
+        if (CollUtil.isEmpty(userIdList)) {
+            return new ArrayList<>();
+        }
+
+        // 3. 一次性查询员工维度的所有维度配置（org='PERSON'）
+        ScoreDimension dimensionQuery = new ScoreDimension();
+        dimensionQuery.setStatus("0");
+        dimensionQuery.setOrg(ScoreLevelEnum.PERSON.getCode());
+        if (ObjUtil.isNotNull(queryReq.getDimensionId())) {
+            dimensionQuery.setId(queryReq.getDimensionId());
+        }
+        List<ScoreDimension> dimensions = scoreDimensionMapper.selectList(dimensionQuery);
+        
+        if (CollUtil.isEmpty(dimensions)) {
+            return new ArrayList<>();
+        }
+
+
+        List<Long> indicatorIdList = null;
+        if (ObjUtil.isNotNull(queryReq.getDimensionId())) {
+            indicatorIdList = dimensions.stream().map(ScoreDimension::getId).collect(Collectors.toList());
+
+        }
+
+        // 一次性查询event表中该时间段内的事件数据
+        List<ScoreEvent> scoreEventList = ledgerWarningMapper.selectScoreEventList(
+                queryReq.getStartDate(), 
+                queryReq.getEndDate(), 
+                null,
+                userIdList,
+                indicatorIdList);
+
+        // 5. 用户名到用户对象的映射
+        Map<String, SysUser> userNameToUserMap = sysUserMap.values().stream()
+                .collect(Collectors.toMap(SysUser::getNickName, user -> user, (u1, u2) -> u1));
+
+        // 6. 按用户和维度分组统计事件分值
+        // Key: userId_dimensionId, Value: eventScore总和
+        Map<String, BigDecimal> userDimEventScoreMap = new HashMap<>();
+        
+        for (ScoreEvent event : scoreEventList) {
+            if (ObjUtil.isNull(event.getDimensionId()) || StrUtil.isEmpty(event.getPersonName())) {
+                continue;
+            }
+            
+            Long dimId = event.getDimensionId();
+            
+            // 如果指定了dimensionId，只统计该维度的事件
+            if (ObjUtil.isNotNull(queryReq.getDimensionId()) && !dimId.equals(queryReq.getDimensionId())) {
+                continue;
+            }
+            
+            BigDecimal eventScore = event.getTotalScore() != null ? event.getTotalScore() : BigDecimal.ZERO;
+            
+            // 处理person_name可能包含多个用户名的情况
+            String[] personNames = event.getPersonName().split("[,，]");
+            for (String personName : personNames) {
+                String trimmedName = personName.trim();
+                SysUser user = userNameToUserMap.get(trimmedName);
+                if (user != null) {
+                    String key = user.getUserId() + "_" + dimId;
+                    userDimEventScoreMap.merge(key, eventScore, BigDecimal::add);
+                }
+            }
+        }
+
+        // 7. 预计算用户的组织信息
+        Map<Long, UserOrgInfo> userOrgInfoMap = new HashMap<>();
+        for (SysUser user : sysUserMap.values()) {
+            UserOrgInfo orgInfo = buildUserOrgInfo(user, allDeptMap, brigadeSubDeptsMap);
+            userOrgInfoMap.put(user.getUserId(), orgInfo);
+        }
+
+        // 8. 构建结果列表
+        List<EmployeeDimensionScoreVO> resultList = new ArrayList<>(userIdList.size() * dimensions.size());
+        
+        for (Long userId : userIdList) {
+            SysUser sysUser = sysUserMap.get(userId);
+            if (sysUser == null) {
+                continue;
+            }
+
+            UserOrgInfo orgInfo = userOrgInfoMap.get(userId);
+            
+            // 为每个维度生成一条记录
+            for (ScoreDimension dimension : dimensions) {
+                EmployeeDimensionScoreVO vo = new EmployeeDimensionScoreVO();
+                vo.setUserId(userId);
+                vo.setPersonName(sysUser.getNickName());
+                vo.setDeptName(orgInfo != null ? orgInfo.deptName : "");
+                vo.setTeamName(orgInfo != null ? orgInfo.teamName : "");
+                vo.setGroupName(orgInfo != null ? orgInfo.groupName : "");
+                vo.setDimensionName(dimension.getName());
+                
+                // 基础分
+                BigDecimal baseScore = dimension.getBaseScore() != null ? dimension.getBaseScore() : BigDecimal.valueOf(80);
+                vo.setBaseScore(baseScore);
+                
+                // 事件加减分合计
+                String key = userId + "_" + dimension.getId();
+                BigDecimal eventScore = userDimEventScoreMap.getOrDefault(key, BigDecimal.ZERO);
+                vo.setEventScore(eventScore);
+                
+                // 维度分值 = 基础分 + 事件加减分
+                BigDecimal dimensionScore = baseScore.add(eventScore);
+                vo.setDimensionScore(dimensionScore);
+                
+                // 权重
+                vo.setWeight(dimension.getWeight() != null ? dimension.getWeight() : BigDecimal.ZERO);
+                
+                resultList.add(vo);
+            }
+        }
+
+        // 9. 排序
+        if (ObjUtil.isNull(queryReq.getSorts())) {
+            Map<String, String> sorts = new LinkedHashMap<>();
+            sorts.put("userId", "asc");
+            sorts.put("dimensionName", "asc");
+            queryReq.setSorts(sorts);
+        }
+        
+        List<EmployeeDimensionScoreVO> result = StreamSortUtils.sort(resultList, queryReq.getSorts());
+        return result;
+    }
+
+    /**
+     * 用户组织信息内部类
+     */
+    private static class UserOrgInfo {
+        String deptName;
+        String teamName;
+        String groupName;
+
+        UserOrgInfo(String deptName, String teamName, String groupName) {
+            this.deptName = deptName;
+            this.teamName = teamName;
+            this.groupName = groupName;
+        }
+    }
+
+    /**
+     * 构建用户组织信息
+     */
+    private UserOrgInfo buildUserOrgInfo(SysUser user, Map<Long, SysDept> allDeptMap, Map<Long, Set<Long>> brigadeSubDeptsMap) {
+        String deptName = "";
+        String teamName = "";
+        String groupName = "";
+        
+        if (user.getDeptId() == null) {
+            return new UserOrgInfo(deptName, teamName, groupName);
+        }
+
+        // 获取用户所在大队名称
+        Long brigadeId = findUserBrigade(user.getDeptId(), brigadeSubDeptsMap);
+        if (brigadeId != null && allDeptMap.containsKey(brigadeId)) {
+            deptName = allDeptMap.get(brigadeId).getDeptName();
+        }
+
+        // 获取用户的直接部门信息
+        SysDept userDept = allDeptMap.get(user.getDeptId());
+        if (userDept != null) {
+            // 根据部门类型判断是班组还是小组
+            if (DeptTypeEnum.TEAMS.getCode().equals(userDept.getDeptType())) {
+                groupName = userDept.getDeptName();
+                // 查找上级班组
+                if (userDept.getParentId() != null && userDept.getParentId() != 0) {
+                    SysDept parentDept = allDeptMap.get(userDept.getParentId());
+                    if (parentDept != null && DeptTypeEnum.MANAGER.getCode().equals(parentDept.getDeptType())) {
+                        teamName = parentDept.getDeptName();
+                    }
+                }
+            } else if (DeptTypeEnum.MANAGER.getCode().equals(userDept.getDeptType())) {
+                teamName = userDept.getDeptName();
+            }
+        }
+
+        return new UserOrgInfo(deptName, teamName, groupName);
+    }
+
 }

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

@@ -191,6 +191,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="dimensionIdList != null and dimensionIdList.size() > 0">
+            and dimension_id in
+            <foreach collection="dimensionIdList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <!--        由于person_name存在多用户时person_id为空,因此不能根据person_id进行查询-->
         <!--        <if test="userIdList != null and userIdList.size() > 0">-->
         <!--            and person_id in-->

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

@@ -29,6 +29,7 @@
     <select id="selectList" parameterType="com.sundot.airport.ledger.domain.ScoreDimension"
             resultMap="ScoreDimensionResult">
         <include refid="selectVo"/>
+        <if test="id != null">AND id = #{id}</if>
         <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>