Merge remote-tracking branch 'origin/master'

airport-admin/src/main/java/com/sundot/airport/web/controller/score/DeptPortraitController.java

@@ -0,0 +1,180 @@
+package com.sundot.airport.web.controller.score;
+
+import com.sundot.airport.common.core.controller.BaseController;
+import com.sundot.airport.common.core.domain.AjaxResult;
+import com.sundot.airport.ledger.dto.DeptMemberDistributionDTO;
+import com.sundot.airport.ledger.dto.DeptMemberDTO;
+import com.sundot.airport.ledger.dto.DeptPortraitQueryDTO;
+import com.sundot.airport.ledger.dto.GroupPortraitDTO;
+import com.sundot.airport.ledger.service.IDeptPortraitService;
+import com.sundot.airport.ledger.service.IGroupPortraitService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <b>功能名：</b>DeptPortraitController<br>
+ * <b>说明：</b> 部门画像Controller（团队成员展示）<br>
+ * <b>著作权：</b> Copyright (C) 2025 SUNDOT CORPORATION<br>
+ *
+ * @author Claude
+ */
+@Api(tags = "部门画像-团队成员")
+@RestController
+@RequestMapping("/score/dept-portrait")
+public class DeptPortraitController extends BaseController {
+
+    @Autowired
+    private IDeptPortraitService deptPortraitService;
+
+    @Autowired
+    private IGroupPortraitService groupPortraitService;
+
+    /**
+     * 获取部门内所有成员列表（部门画像-团队成员展示）
+     * <p>
+     * 查询指定部门及其所有下级部门的成员信息，包括：
+     * 姓名、年龄、工龄、性别、民族、政治面貌、职务、职业资格等级、开机年限、综合得分
+     * </p>
+     *
+     * @param query 查询参数对象
+     * @return 部门成员列表
+     */
+    @ApiOperation("获取部门内所有成员列表")
+    @PostMapping("/members")
+    public AjaxResult getDeptMembers(@RequestBody DeptPortraitQueryDTO query) {
+        try {
+            // 参数校验
+            if (query == null || query.getDeptId() == null) {
+                return error("部门ID不能为空");
+            }
+
+            // 如果没有传日期范围,则默认为91天
+            if (query.getStartDate() == null || query.getEndDate() == null) {
+                java.time.LocalDate today = java.time.LocalDate.now();
+                query.setEndDate(today.toString());
+                query.setStartDate(today.minusDays(91).toString());
+            }
+
+            List<DeptMemberDTO> members = deptPortraitService.getDeptMembers(query);
+
+            return success(members);
+        } catch (Exception e) {
+            logger.error("获取部门成员列表失败", e);
+            return error("获取部门成员列表失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取部门成员基本情况分布（用于饼图展示）
+     * <p>
+     * 统计指定部门及其下级部门成员的：
+     * 1. 性别分布
+     * 2. 民族分布
+     * 3. 政治面貌分布
+     * </p>
+     *
+     * @param query 查询参数对象
+     * @return 成员基本情况分布数据
+     */
+    @ApiOperation("获取部门成员基本情况分布")
+    @PostMapping("/distribution")
+    public AjaxResult getMemberDistribution(@RequestBody DeptPortraitQueryDTO query) {
+        try {
+            // 参数校验
+            if (query == null || query.getDeptId() == null) {
+                return error("部门ID不能为空");
+            }
+
+            // 如果没有传日期范围,则默认为91天
+            if (query.getStartDate() == null || query.getEndDate() == null) {
+                java.time.LocalDate today = java.time.LocalDate.now();
+                query.setEndDate(today.toString());
+                query.setStartDate(today.minusDays(91).toString());
+            }
+
+            DeptMemberDistributionDTO distribution = deptPortraitService.getMemberDistribution(query);
+
+            return success(distribution);
+        } catch (Exception e) {
+            logger.error("获取部门成员分布失败", e);
+            return error("获取部门成员分布失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 获取部门成员职位情况分布（用于柱状图展示）
+     * <p>
+     * 统计指定部门及其下级部门成员的：
+     * 1. 职业资格等级分布（等级1-等级5）
+     * 2. 开机年限分布（0-3年、4-7年、8-11年、12-15年、15-18年）
+     * 3. 岗位资质分布（前传、操机、人身、验证、开箱包、开机）
+     * </p>
+     *
+     * @param query 查询参数对象
+     * @return 成员职位情况分布数据
+     */
+    @ApiOperation("获取部门成员职位情况分布")
+    @PostMapping("/position-distribution")
+    public AjaxResult getPositionDistribution(@RequestBody DeptPortraitQueryDTO query) {
+        try {
+            // 参数校验
+            if (query == null || query.getDeptId() == null) {
+                return error("部门ID不能为空");
+            }
+
+            // 如果没有传日期范围,则默认为91天
+            if (query.getStartDate() == null || query.getEndDate() == null) {
+                java.time.LocalDate today = java.time.LocalDate.now();
+                query.setEndDate(today.toString());
+                query.setStartDate(today.minusDays(91).toString());
+            }
+
+            DeptMemberDistributionDTO distribution = deptPortraitService.getPositionDistribution(query);
+
+            return success(distribution);
+        } catch (Exception e) {
+            logger.error("获取部门成员职位分布失败", e);
+            return error("获取部门成员职位分布失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 维度得分一览
+     * 计算规则：
+     * 1. 根据员工配分表，计算小组六维度均值
+     * 2. 小组各维度最终分值 = 基础分 + 员工维度均值 + 小组特有合计分值
+     * 3. 综合评分 = Σ(各维度最终分值 × 权重 / 100)
+     * </p>
+     *
+     * @param query 查询参数对象
+     * @return 组织画像数据
+     */
+    @ApiOperation("维度得分一览")
+    @PostMapping("/group-portrait")
+    public AjaxResult getGroupPortrait(@RequestBody DeptPortraitQueryDTO query) {
+        try {
+            // 参数校验
+            if (query == null || query.getDeptId() == null) {
+                return error("部门ID不能为空");
+            }
+
+            // 如果没有传日期范围,则默认为91天
+            if (query.getStartDate() == null || query.getEndDate() == null) {
+                java.time.LocalDate today = java.time.LocalDate.now();
+                query.setEndDate(today.toString());
+                query.setStartDate(today.minusDays(91).toString());
+            }
+
+            GroupPortraitDTO portrait = groupPortraitService.getGroupPortrait(query);
+
+            return success(portrait);
+        } catch (Exception e) {
+            logger.error("获取组织画像失败", e);
+            return error("获取组织画像失败：" + e.getMessage());
+        }
+    }
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/domain/ScoreDimension.java

@@ -36,6 +36,9 @@ public class ScoreDimension extends BaseEntity {
     @Excel(name = "层级维度", readConverterExp = "1=部门,2=队室,3=通道,4=员工", combo = "部门,队室,通道,员工")
     private String org;
 
+    /** 维度对照关系（用于关联不同org层级的维度） */
+    private String dimRelationship;
+
     public Long getId() { return id; }
     public void setId(Long id) { this.id = id; }
 
@@ -56,4 +59,7 @@ public class ScoreDimension extends BaseEntity {
 
     public String getOrg() { return org; }
     public void setOrg(String org) { this.org = org; }
+
+    public String getDimRelationship() { return dimRelationship; }
+    public void setDimRelationship(String dimRelationship) { this.dimRelationship = dimRelationship; }
 }

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

@@ -0,0 +1,159 @@
+package com.sundot.airport.ledger.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <b>功能名：</b>DeptMemberDTO<br>
+ * <b>说明：</b> 部门成员信息DTO（用于部门画像展示）<br>
+ * <b>著作权：</b> Copyright (C) 2025 SUNDOT CORPORATION<br>
+ *
+ * @author Claude
+ */
+public class DeptMemberDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 姓名
+     */
+    private String personName;
+
+    /**
+     * 年龄
+     */
+    private Integer age;
+
+    /**
+     * 工龄(年)
+     */
+    private Integer workYears;
+
+    /**
+     * 性别
+     */
+    private String sex;
+
+    /**
+     * 民族
+     */
+    private String nation;
+
+    /**
+     * 政治面貌
+     */
+    private String politicalStatus;
+
+    /**
+     * 职务
+     */
+    private String roleNames;
+
+    /**
+     * 职业资格等级
+     */
+    private String qualificationLevel;
+
+    /**
+     * 开机年限(年)
+     */
+    private Integer xrayOperatorYears;
+
+    /**
+     * 综合得分
+     */
+    private BigDecimal totalScore;
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public String getPersonName() {
+        return personName;
+    }
+
+    public void setPersonName(String personName) {
+        this.personName = personName;
+    }
+
+    public Integer getAge() {
+        return age;
+    }
+
+    public void setAge(Integer age) {
+        this.age = age;
+    }
+
+    public Integer getWorkYears() {
+        return workYears;
+    }
+
+    public void setWorkYears(Integer workYears) {
+        this.workYears = workYears;
+    }
+
+    public String getSex() {
+        return sex;
+    }
+
+    public void setSex(String sex) {
+        this.sex = sex;
+    }
+
+    public String getNation() {
+        return nation;
+    }
+
+    public void setNation(String nation) {
+        this.nation = nation;
+    }
+
+    public String getPoliticalStatus() {
+        return politicalStatus;
+    }
+
+    public void setPoliticalStatus(String politicalStatus) {
+        this.politicalStatus = politicalStatus;
+    }
+
+    public String getRoleNames() {
+        return roleNames;
+    }
+
+    public void setRoleNames(String roleNames) {
+        this.roleNames = roleNames;
+    }
+
+    public String getQualificationLevel() {
+        return qualificationLevel;
+    }
+
+    public void setQualificationLevel(String qualificationLevel) {
+        this.qualificationLevel = qualificationLevel;
+    }
+
+    public Integer getXrayOperatorYears() {
+        return xrayOperatorYears;
+    }
+
+    public void setXrayOperatorYears(Integer xrayOperatorYears) {
+        this.xrayOperatorYears = xrayOperatorYears;
+    }
+
+    public BigDecimal getTotalScore() {
+        return totalScore;
+    }
+
+    public void setTotalScore(BigDecimal totalScore) {
+        this.totalScore = totalScore;
+    }
+}

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

@@ -0,0 +1,135 @@
+package com.sundot.airport.ledger.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <b>功能名：</b>DeptMemberDistributionDTO<br>
+ * <b>说明：</b> 部门成员基本情况分布DTO（用于饼图展示）<br>
+ * <b>著作权：</b> Copyright (C) 2025 SUNDOT CORPORATION<br>
+ *
+ * @author Claude
+ */
+public class DeptMemberDistributionDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 性别分布
+     */
+    private List<DistributionItem> sexDistribution;
+
+    /**
+     * 民族分布
+     */
+    private List<DistributionItem> nationDistribution;
+
+    /**
+     * 政治面貌分布
+     */
+    private List<DistributionItem> politicalDistribution;
+
+    /**
+     * 职业资格等级分布
+     */
+    private List<DistributionItem> qualificationDistribution;
+
+    /**
+     * 开机年限分布
+     */
+    private List<DistributionItem> xrayYearDistribution;
+
+    /**
+     * 岗位资质分布
+     */
+    private List<DistributionItem> positionDistribution;
+
+    /**
+     * 分布项内部类
+     */
+    public static class DistributionItem implements Serializable {
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 名称（如：男、女、汉族等）
+         */
+        private String name;
+
+        /**
+         * 数量
+         */
+        private Integer count;
+
+        public DistributionItem() {
+        }
+
+        public DistributionItem(String name, Integer count) {
+            this.name = name;
+            this.count = count;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public Integer getCount() {
+            return count;
+        }
+
+        public void setCount(Integer count) {
+            this.count = count;
+        }
+    }
+
+    public List<DistributionItem> getSexDistribution() {
+        return sexDistribution;
+    }
+
+    public void setSexDistribution(List<DistributionItem> sexDistribution) {
+        this.sexDistribution = sexDistribution;
+    }
+
+    public List<DistributionItem> getNationDistribution() {
+        return nationDistribution;
+    }
+
+    public void setNationDistribution(List<DistributionItem> nationDistribution) {
+        this.nationDistribution = nationDistribution;
+    }
+
+    public List<DistributionItem> getPoliticalDistribution() {
+        return politicalDistribution;
+    }
+
+    public void setPoliticalDistribution(List<DistributionItem> politicalDistribution) {
+        this.politicalDistribution = politicalDistribution;
+    }
+
+    public List<DistributionItem> getQualificationDistribution() {
+        return qualificationDistribution;
+    }
+
+    public void setQualificationDistribution(List<DistributionItem> qualificationDistribution) {
+        this.qualificationDistribution = qualificationDistribution;
+    }
+
+    public List<DistributionItem> getXrayYearDistribution() {
+        return xrayYearDistribution;
+    }
+
+    public void setXrayYearDistribution(List<DistributionItem> xrayYearDistribution) {
+        this.xrayYearDistribution = xrayYearDistribution;
+    }
+
+    public List<DistributionItem> getPositionDistribution() {
+        return positionDistribution;
+    }
+
+    public void setPositionDistribution(List<DistributionItem> positionDistribution) {
+        this.positionDistribution = positionDistribution;
+    }
+}

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

@@ -0,0 +1,64 @@
+package com.sundot.airport.ledger.dto;
+
+
+import java.io.Serializable;
+
+/**
+ * <b>功能名：</b>DeptPortraitQueryDTO<br>
+ * <b>说明：</b> 部门画像查询参数DTO <br>
+ * <b>著作权：</b> Copyright (C) 2025 SUNDOT CORPORATION<br>
+ *
+ * @author Claude
+ */
+public class DeptPortraitQueryDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门ID (必填)
+     */
+    private Long deptId;
+
+    /**
+     * 开始日期 YYYY-MM-DD (可选)
+     */
+    private String startDate;
+
+    /**
+     * 结束日期 YYYY-MM-DD (可选)
+     */
+    private String endDate;
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    @Override
+    public String toString() {
+        return "DeptPortraitQueryDTO{" +
+                "deptId=" + deptId +
+                ", startDate='" + startDate + '\'' +
+                ", endDate='" + endDate + '\'' +
+                '}';
+    }
+}

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

@@ -0,0 +1,108 @@
+package com.sundot.airport.ledger.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * <b>功能名：</b>GroupPortraitDTO<br>
+ * <b>说明：</b> 组织画像（小组/通道维度）DTO<br>
+ * <b>著作权：</b> Copyright (C) 2025 SUNDOT CORPORATION<br>
+ *
+ * @author Claude
+ */
+@Data
+public class GroupPortraitDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 部门ID
+     */
+    private Long deptId;
+
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 部门类型（班组/通道/科室等）
+     */
+    private String deptType;
+
+    /**
+     * 查询周期
+     */
+    private String period;
+
+    /**
+     * 小组成员数
+     */
+    private Integer memberCount;
+
+    /**
+     * 各维度得分列表
+     */
+    private List<DimensionScore> dimensions;
+
+    /**
+     * 综合评分
+     */
+    private BigDecimal totalScore;
+
+    /**
+     * 维度得分项
+     */
+    @Data
+    public static class DimensionScore implements Serializable {
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 维度名称
+         */
+        private String name;
+
+        /**
+         * 小组六维度均值（员工平均）
+         */
+        private BigDecimal groupAverageScore;
+
+        /**
+         * 基础分
+         */
+        private BigDecimal baseScore;
+
+        /**
+         * 小组维度特有加分
+         */
+        private BigDecimal addScore;
+
+        /**
+         * 小组维度特有减分
+         */
+        private BigDecimal subtractScore;
+
+        /**
+         * 特有合计（加分-减分）
+         */
+        private BigDecimal specialTotal;
+
+        /**
+         * 最终分值（基础分+均值+特有合计）
+         */
+        private BigDecimal finalScore;
+
+        /**
+         * 权重
+         */
+        private BigDecimal weight;
+
+        /**
+         * 贡献分值（最终分值*权重/100）
+         */
+        private BigDecimal contribution;
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.sundot.airport.ledger.service;
+
+import com.sundot.airport.ledger.dto.DeptMemberDistributionDTO;
+import com.sundot.airport.ledger.dto.DeptMemberDTO;
+import com.sundot.airport.ledger.dto.DeptPortraitQueryDTO;
+
+import java.util.List;
+
+/**
+ * <b>功能名：</b>IDeptPortraitService<br>
+ * <b>说明：</b> 部门画像Service接口 <br>
+ * <b>著作权：</b> Copyright (C) 2025 SUNDOT CORPORATION<br>
+ *
+ * @author Claude
+ */
+public interface IDeptPortraitService {
+
+    /**
+     * 获取部门内所有成员列表（部门画像-团队成员）
+     * <p>
+     * 查询指定部门及其所有下级部门的成员信息，包括：
+     * 姓名、年龄、工龄、性别、民族、政治面貌、职务、职业资格等级、开机年限、综合得分
+     * </p>
+     *
+     * @param query 查询参数对象(deptId, startDate, endDate)
+     * @return 部门成员列表
+     */
+    List<DeptMemberDTO> getDeptMembers(DeptPortraitQueryDTO query);
+
+    /**
+     * 获取部门成员基本情况分布（用于饼图展示）
+     * <p>
+     * 统计指定部门及其下级部门成员的：
+     * 1. 性别分布
+     * 2. 民族分布
+     * 3. 政治面貌分布
+     * </p>
+     *
+     * @param query 查询参数对象(deptId, startDate, endDate)
+     * @return 成员基本情况分布数据
+     */
+    DeptMemberDistributionDTO getMemberDistribution(DeptPortraitQueryDTO query);
+
+    /**
+     * 获取部门成员职位情况分布（用于柱状图展示）
+     * <p>
+     * 统计指定部门及其下级部门成员的：
+     * 1. 职业资格等级分布（等级1-等级5）
+     * 2. 开机年限分布（0-3年、4-7年、8-11年、12-15年、15-18年）
+     * 3. 岗位资质分布（前传、操机、人身、验证、开箱包、开机）
+     * </p>
+     *
+     * @param query 查询参数对象(deptId, startDate, endDate)
+     * @return 成员职位情况分布数据
+     */
+    DeptMemberDistributionDTO getPositionDistribution(DeptPortraitQueryDTO query);
+}

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

@@ -0,0 +1,31 @@
+package com.sundot.airport.ledger.service;
+
+import com.sundot.airport.ledger.dto.DeptPortraitQueryDTO;
+import com.sundot.airport.ledger.dto.GroupPortraitDTO;
+
+/**
+ * <b>功能名：</b>IGroupPortraitService<br>
+ * <b>说明：</b> 组织画像Service接口（小组/通道维度）<br>
+ * <b>著作权：</b> Copyright (C) 2025 SUNDOT CORPORATION<br>
+ *
+ * @author Claude
+ */
+public interface IGroupPortraitService {
+
+    /**
+     * 获取组织画像（小组/通道维度）
+     * <p>
+     * 计算步骤：
+     * 1. 根据员工配分表，计算小组六维度均值
+     * 2. 小组各维度最终分值计分：
+     *    ①将小组特有维度及其他维度特有指标项分值累计，得出小组各维度特有合计分值
+     *    ②将各维度基础分、特有合计计分、员工维度均值三项内容相加得到小组各维度最终分值
+     * 3. 加权平均法：将小组各维度最终分值乘以其相应权重后的总和除以权重的总和
+     * 4. 小组综合评分：小组各维度贡献分值合计后四舍五入，保留两位小数
+     * </p>
+     *
+     * @param query 查询参数(deptId, startDate, endDate)
+     * @return 组织画像数据
+     */
+    GroupPortraitDTO getGroupPortrait(DeptPortraitQueryDTO query);
+}

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

@@ -0,0 +1,408 @@
+package com.sundot.airport.ledger.service.impl;
+
+import com.sundot.airport.common.core.domain.entity.SysRole;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.ledger.domain.ScoreDimension;
+import com.sundot.airport.ledger.domain.ScoreEvent;
+import com.sundot.airport.ledger.dto.DeptMemberDistributionDTO;
+import com.sundot.airport.ledger.dto.DeptMemberDTO;
+import com.sundot.airport.ledger.dto.DeptPortraitQueryDTO;
+import com.sundot.airport.ledger.mapper.ScoreDimensionMapper;
+import com.sundot.airport.ledger.mapper.ScoreEventMapper;
+import com.sundot.airport.ledger.service.IDeptPortraitService;
+import com.sundot.airport.system.domain.BasePosition;
+import com.sundot.airport.system.mapper.BasePositionMapper;
+import com.sundot.airport.system.mapper.SysRoleMapper;
+import com.sundot.airport.system.mapper.SysUserMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.Period;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * <b>功能名：</b>DeptPortraitServiceImpl<br>
+ * <b>说明：</b> 部门画像Service实现（团队成员查询）<br>
+ * <b>著作权：</b> Copyright (C) 2025 SUNDOT CORPORATION<br>
+ *
+ * @author Claude
+ */
+@Service
+public class DeptPortraitServiceImpl implements IDeptPortraitService {
+
+    private static final Logger log = LoggerFactory.getLogger(DeptPortraitServiceImpl.class);
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Autowired
+    private SysRoleMapper sysRoleMapper;
+
+    @Autowired
+    private ScoreEventMapper scoreEventMapper;
+
+    @Autowired
+    private ScoreDimensionMapper scoreDimensionMapper;
+
+    @Autowired
+    private BasePositionMapper basePositionMapper;
+
+    @Override
+    public List<DeptMemberDTO> getDeptMembers(DeptPortraitQueryDTO query) {
+        // 递归查询所有下级部门的用户
+        SysUser userQuery = new SysUser();
+        userQuery.setDeptId(query.getDeptId());
+        userQuery.setStatus("0");
+        
+        List<SysUser> allUsers = sysUserMapper.selectUserList(userQuery);
+        
+        if (allUsers == null || allUsers.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        List<DeptMemberDTO> result = allUsers.stream()
+                .map(user -> convertToDeptMemberDTO(user, query.getStartDate(), query.getEndDate()))
+                .collect(Collectors.toList());
+
+        return result;
+    }
+
+    @Override
+    public DeptMemberDistributionDTO getMemberDistribution(DeptPortraitQueryDTO query) {
+        SysUser userQuery = new SysUser();
+        userQuery.setDeptId(query.getDeptId());
+        userQuery.setStatus("0");
+        
+        List<SysUser> allUsers = sysUserMapper.selectUserList(userQuery);
+        
+        if (allUsers == null || allUsers.isEmpty()) {
+            return new DeptMemberDistributionDTO();
+        }
+
+        DeptMemberDistributionDTO distribution = new DeptMemberDistributionDTO();
+        distribution.setSexDistribution(calculateDistribution(allUsers, SysUser::getSex, this::decodeSex));
+        distribution.setNationDistribution(calculateDistribution(allUsers, SysUser::getNation, this::decodeNation));
+        distribution.setPoliticalDistribution(calculateDistribution(allUsers, SysUser::getPoliticalStatus, this::decodePoliticalStatusForDistribution));
+        
+        return distribution;
+    }
+
+    @Override
+    public DeptMemberDistributionDTO getPositionDistribution(DeptPortraitQueryDTO query) {
+        SysUser userQuery = new SysUser();
+        userQuery.setDeptId(query.getDeptId());
+        userQuery.setStatus("0");
+        
+        List<SysUser> allUsers = sysUserMapper.selectUserList(userQuery);
+        
+        if (allUsers == null || allUsers.isEmpty()) {
+            return new DeptMemberDistributionDTO();
+        }
+
+        DeptMemberDistributionDTO distribution = new DeptMemberDistributionDTO();
+        
+        // 统计职业资格等级分布
+        distribution.setQualificationDistribution(calculateQualificationDistribution(allUsers));
+        
+        // 统计开机年限分布
+        distribution.setXrayYearDistribution(calculateXrayYearDistribution(allUsers));
+        
+        // 统计岗位资质分布
+        distribution.setPositionDistribution(calculatePositionDistribution(allUsers));
+        
+        return distribution;
+    }
+
+    /**
+     * 统计职业资格等级分布
+     */
+    private List<DeptMemberDistributionDTO.DistributionItem> calculateQualificationDistribution(List<SysUser> users) {
+        return users.stream()
+                .map(SysUser::getQualificationLevel)
+                .filter(Objects::nonNull)
+                .filter(s -> !s.isEmpty())
+                .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()))
+                .entrySet().stream()
+                .map(entry -> new DeptMemberDistributionDTO.DistributionItem(
+                        decodeQualificationLevelForChart(entry.getKey()),
+                        entry.getValue().intValue()
+                ))
+                .sorted((a, b) -> {
+                    // 按等级排序
+                    String[] order = {"等级1", "等级2", "等级3", "等级4", "等级5"};
+                    return Arrays.asList(order).indexOf(a.getName()) - Arrays.asList(order).indexOf(b.getName());
+                })
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 统计开机年限分布
+     */
+    private List<DeptMemberDistributionDTO.DistributionItem> calculateXrayYearDistribution(List<SysUser> users) {
+        Map<String, Integer> yearRanges = new LinkedHashMap<>();
+        yearRanges.put("0-3", 0);
+        yearRanges.put("4-7", 0);
+        yearRanges.put("8-11", 0);
+        yearRanges.put("12-15", 0);
+        yearRanges.put("15-18", 0);
+
+        for (SysUser user : users) {
+            if (user.getXrayOperatorStarttime() != null) {
+                int years = calculateYears(user.getXrayOperatorStarttime());
+                if (years >= 0 && years <= 3) {
+                    yearRanges.put("0-3", yearRanges.get("0-3") + 1);
+                } else if (years >= 4 && years <= 7) {
+                    yearRanges.put("4-7", yearRanges.get("4-7") + 1);
+                } else if (years >= 8 && years <= 11) {
+                    yearRanges.put("8-11", yearRanges.get("8-11") + 1);
+                } else if (years >= 12 && years <= 15) {
+                    yearRanges.put("12-15", yearRanges.get("12-15") + 1);
+                } else if (years >= 16) {
+                    yearRanges.put("15-18", yearRanges.get("15-18") + 1);
+                }
+            }
+        }
+
+        return yearRanges.entrySet().stream()
+                .map(entry -> new DeptMemberDistributionDTO.DistributionItem(
+                        entry.getKey() + "年",
+                        entry.getValue()
+                ))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 统计岗位资质分布
+     * 从base_position表查询岗位资质，按position_type='SECURITY_POSITION'筛选
+     */
+    private List<DeptMemberDistributionDTO.DistributionItem> calculatePositionDistribution(List<SysUser> users) {
+        // 查询所有安检岗位
+        BasePosition query = new BasePosition();
+        query.setPositionType("SECURITY_POSITION");
+        List<BasePosition> allPositions = basePositionMapper.selectBasePositionList(query);
+        
+        // 初始化岗位统计Map，按岗位名称统计
+        Map<String, Integer> positionMap = new LinkedHashMap<>();
+        if (allPositions != null) {
+            for (BasePosition pos : allPositions) {
+                positionMap.put(pos.getName(), 0);
+            }
+        }
+        
+        // 统计每个用户的岗位
+        for (SysUser user : users) {
+            String positions = user.getSecurityInspectionPosition();
+            if (positions != null && !positions.isEmpty()) {
+                // 岗位可能用逗号分隔
+                String[] positionArray = positions.split("[,，]");
+                for (String pos : positionArray) {
+                    String trimmed = pos.trim();
+                    if (positionMap.containsKey(trimmed)) {
+                        positionMap.put(trimmed, positionMap.get(trimmed) + 1);
+                    }
+                }
+            }
+        }
+        
+        return positionMap.entrySet().stream()
+                .map(entry -> new DeptMemberDistributionDTO.DistributionItem(
+                        entry.getKey(),
+                        entry.getValue()
+                ))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * 解码职业资格等级（用于图表显示）
+     */
+    private String decodeQualificationLevelForChart(String v) {
+        if (v == null) return "未知";
+        switch (v) {
+            case "LEVEL_ONE": return "等级1";
+            case "LEVEL_TWO": return "等级2";
+            case "LEVEL_THREE": return "等级3";
+            case "LEVEL_FOUR": return "等级4";
+            case "LEVEL_FIVE": return "等级5";
+            default: return v;
+        }
+    }
+
+    private List<DeptMemberDistributionDTO.DistributionItem> calculateDistribution(
+            List<SysUser> users,
+            Function<SysUser, String> extractor,
+            Function<String, String> decoder) {
+        
+        return users.stream()
+                .map(extractor)
+                .filter(Objects::nonNull)
+                .filter(s -> !s.isEmpty())
+                .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()))
+                .entrySet().stream()
+                .map(entry -> new DeptMemberDistributionDTO.DistributionItem(
+                        decoder.apply(entry.getKey()),
+                        entry.getValue().intValue()
+                ))
+                .sorted((a, b) -> b.getCount() - a.getCount())
+                .collect(Collectors.toList());
+    }
+
+    private String decodeSex(String sex) {
+        if (sex == null || sex.isEmpty()) return "未知";
+        return "0".equals(sex) ? "男" : "1".equals(sex) ? "女" : "其他";
+    }
+
+    private String decodeNation(String nation) {
+        if (nation == null || nation.isEmpty()) return "未知";
+        return nation;
+    }
+
+    private String decodePoliticalStatusForDistribution(String politicalStatus) {
+        if (politicalStatus == null || politicalStatus.isEmpty()) return "未知";
+        switch (politicalStatus) {
+            case "COMMUNIST_PARTY_MEMBER": return "中共党员";
+            case "PROBATIONARY_COMMUNIST_PARTY_MEMBER": return "中共预备党员";
+            case "COMMUNIST_YOUTH_LEAGUE_MEMBER": return "共青团员";
+            case "MASS_PUBLIC": return "群众";
+            default: return politicalStatus;
+        }
+    }
+
+    private DeptMemberDTO convertToDeptMemberDTO(SysUser user, String startDate, String endDate) {
+        DeptMemberDTO dto = new DeptMemberDTO();
+        dto.setUserId(user.getUserId());
+        dto.setPersonName(user.getNickName());
+        dto.setSex("0".equals(user.getSex()) ? "男" : "1".equals(user.getSex()) ? "女" : "");
+        dto.setNation(user.getNation());
+        dto.setPoliticalStatus(decodePoliticalStatus(user.getPoliticalStatus()));
+        dto.setQualificationLevel(decodeQualificationLevel(user.getQualificationLevel()));
+        dto.setAge(calculateAgeFromIdCard(user.getCardNumber()));
+        
+        if (user.getStartWorkingDate() != null) {
+            dto.setWorkYears(calculateYears(user.getStartWorkingDate()));
+        }
+        if (user.getXrayOperatorStarttime() != null) {
+            dto.setXrayOperatorYears(calculateYears(user.getXrayOperatorStarttime()));
+        }
+        
+        List<SysRole> roles = sysRoleMapper.selectRolesByUserName(user.getUserName());
+        if (roles != null && !roles.isEmpty()) {
+            String roleNames = roles.stream()
+                    .map(SysRole::getRoleName)
+                    .filter(s -> s != null && !s.isEmpty())
+                    .collect(Collectors.joining("、"));
+            dto.setRoleNames(roleNames);
+        }
+        
+        BigDecimal totalScore = calculateTotalScore(user.getNickName(), startDate, endDate);
+        dto.setTotalScore(totalScore);
+
+        return dto;
+    }
+
+    private BigDecimal calculateTotalScore(String personName, String beginTime, String endTime) {
+        ScoreEvent eventQuery = new ScoreEvent();
+        eventQuery.setPersonName(personName);
+        if (beginTime != null && !beginTime.isEmpty()) {
+            eventQuery.getParams().put("beginTime", beginTime);
+        }
+        if (endTime != null && !endTime.isEmpty()) {
+            eventQuery.getParams().put("endTime", endTime);
+        }
+        List<ScoreEvent> events = scoreEventMapper.selectList(eventQuery);
+
+        if (events == null || events.isEmpty()) {
+            return BigDecimal.valueOf(80);
+        }
+
+        Map<Long, BigDecimal> dimMap = new HashMap<>();
+        for (ScoreEvent e : events) {
+            Long dimId = e.getDimensionId();
+            if (dimId == null) continue;
+            String raw = e.getPersonName();
+            if (raw == null) continue;
+            boolean matched = false;
+            for (String n : raw.split("[,，]")) {
+                if (personName.equals(n.trim())) {
+                    matched = true;
+                    break;
+                }
+            }
+            if (!matched) continue;
+            BigDecimal val = e.getTotalScore() != null ? e.getTotalScore() : BigDecimal.ZERO;
+            dimMap.merge(dimId, val, BigDecimal::add);
+        }
+
+        ScoreDimension dq = new ScoreDimension();
+        dq.setStatus("0");
+        List<ScoreDimension> dims = scoreDimensionMapper.selectList(dq);
+        dims.sort(Comparator.comparing(d -> d.getSortOrder() == null ? 999 : d.getSortOrder()));
+
+        BigDecimal total = BigDecimal.ZERO;
+        for (ScoreDimension dim : dims) {
+            BigDecimal eventScore = dimMap.getOrDefault(dim.getId(), BigDecimal.ZERO);
+            BigDecimal base = dim.getBaseScore() != null ? dim.getBaseScore() : BigDecimal.valueOf(80);
+            BigDecimal dimScore = base.add(eventScore);
+            BigDecimal weight = dim.getWeight() != null ? dim.getWeight() : BigDecimal.ZERO;
+            BigDecimal contribution = dimScore.multiply(weight)
+                    .divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
+            total = total.add(contribution);
+        }
+
+        return total.setScale(1, RoundingMode.HALF_UP);
+    }
+
+    private Integer calculateAgeFromIdCard(String idCard) {
+        if (idCard == null || idCard.length() < 14) {
+            return null;
+        }
+        try {
+            String birthDateStr = idCard.substring(6, 14);
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+            LocalDate birthDate = LocalDate.parse(birthDateStr, formatter);
+            LocalDate now = LocalDate.now();
+            return Period.between(birthDate, now).getYears();
+        } catch (Exception e) {
+            log.warn("从身份证计算年龄失败: {}", idCard, e);
+            return null;
+        }
+    }
+
+    private Integer calculateYears(Date startDate) {
+        if (startDate == null) {
+            return null;
+        }
+        long nowMs = System.currentTimeMillis();
+        return (int) ((nowMs - startDate.getTime()) / (365L * 24 * 3600 * 1000));
+    }
+
+    private String decodePoliticalStatus(String v) {
+        if (v == null) return "";
+        switch (v) {
+            case "COMMUNIST_PARTY_MEMBER": return "中共党员";
+            case "PROBATIONARY_COMMUNIST_PARTY_MEMBER": return "中共预备党员";
+            case "COMMUNIST_YOUTH_LEAGUE_MEMBER": return "共青团员";
+            case "MASS_PUBLIC": return "群众";
+            default: return v;
+        }
+    }
+
+    private String decodeQualificationLevel(String v) {
+        if (v == null) return "";
+        switch (v) {
+            case "LEVEL_ONE": return "一级";
+            case "LEVEL_TWO": return "二级";
+            case "LEVEL_THREE": return "三级";
+            case "LEVEL_FOUR": return "四级";
+            case "LEVEL_FIVE": return "五级";
+            default: return v;
+        }
+    }
+}

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

@@ -0,0 +1,352 @@
+package com.sundot.airport.ledger.service.impl;
+
+import com.sundot.airport.common.core.domain.entity.SysDept;
+import com.sundot.airport.common.core.domain.entity.SysUser;
+import com.sundot.airport.ledger.domain.ScoreDimension;
+import com.sundot.airport.ledger.domain.ScoreEvent;
+import com.sundot.airport.ledger.domain.vo.EmployeePortraitVO;
+import com.sundot.airport.ledger.dto.DeptPortraitQueryDTO;
+import com.sundot.airport.ledger.dto.GroupPortraitDTO;
+import com.sundot.airport.ledger.mapper.ScoreDimensionMapper;
+import com.sundot.airport.ledger.mapper.ScoreEventMapper;
+import com.sundot.airport.ledger.service.IGroupPortraitService;
+import com.sundot.airport.system.mapper.SysDeptMapper;
+import com.sundot.airport.system.mapper.SysUserMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <b>功能名：</b>GroupPortraitServiceImpl<br>
+ * <b>说明：</b> 组织画像Service实现（小组/通道维度）<br>
+ * <b>著作权：</b> Copyright (C) 2025 SUNDOT CORPORATION<br>
+ *
+ * @author Claude
+ */
+@Service
+public class GroupPortraitServiceImpl implements IGroupPortraitService {
+
+    private static final Logger log = LoggerFactory.getLogger(GroupPortraitServiceImpl.class);
+
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+
+    @Autowired
+    private ScoreEventMapper scoreEventMapper;
+
+    @Autowired
+    private ScoreDimensionMapper scoreDimensionMapper;
+
+    @Override
+    public GroupPortraitDTO getGroupPortrait(DeptPortraitQueryDTO query) {
+        // 1. 获取部门信息
+        SysDept dept = sysDeptMapper.selectDeptById(query.getDeptId());
+        if (dept == null) {
+            throw new RuntimeException("部门不存在");
+        }
+
+        // 2. 查询部门所有成员
+        SysUser userQuery = new SysUser();
+        userQuery.setDeptId(query.getDeptId());
+        userQuery.setStatus("0");
+        List<SysUser> members = sysUserMapper.selectUserList(userQuery);
+
+        if (members == null || members.isEmpty()) {
+            throw new RuntimeException("该部门暂无成员");
+        }
+
+        // 3. 构建组织画像DTO
+        GroupPortraitDTO portrait = new GroupPortraitDTO();
+        portrait.setDeptId(dept.getDeptId());
+        portrait.setDeptName(dept.getDeptName());
+        portrait.setDeptType(dept.getDeptType());
+        portrait.setPeriod(query.getStartDate() + " ~ " + query.getEndDate());
+        portrait.setMemberCount(members.size());
+
+        // 4. 计算各维度得分
+        List<GroupPortraitDTO.DimensionScore> dimensions = calculateDimensions( dept, query);
+        portrait.setDimensions(dimensions);
+
+        // 5. 计算综合评分（加权平均）
+        BigDecimal totalScore = calculateTotalScore(dimensions);
+        portrait.setTotalScore(totalScore);
+
+        return portrait;
+    }
+
+    /**
+     * 计算各维度得分
+     * 核心逻辑：
+     * 1. 根据当前部门层级查询对应维度
+     * 2. 通过dimRelationship找到下级维度
+     * 3. 如果下级有值，用下级平均值；否则用基础分
+     * 4. 加上当前层级特有分值
+     */
+    private List<GroupPortraitDTO.DimensionScore> calculateDimensions( SysDept dept, DeptPortraitQueryDTO query) {
+        // 1. 根据部门类型确定org值
+        String org = determineOrgByDeptType(dept.getDeptType());
+
+        // 2. 查询当前层级的所有维度定义
+        ScoreDimension dq = new ScoreDimension();
+        dq.setOrg(org);
+        dq.setStatus("0");
+        List<ScoreDimension> dims = scoreDimensionMapper.selectList(dq);
+        dims.sort(Comparator.comparing(d -> d.getSortOrder() == null ? 999 : d.getSortOrder()));
+
+        List<GroupPortraitDTO.DimensionScore> result = new ArrayList<>();
+
+        for (ScoreDimension dim : dims) {
+            // 3. 通过dimRelationship找到下级维度，计算下级平均值
+            BigDecimal lowerLevelAverage = calculateLowerLevelAverage(dim, query.getStartDate(), query.getEndDate());
+            
+            // 4. 获取基础分（如果下级有值就不用基础分）
+            BigDecimal baseScore = dim.getBaseScore() != null ? dim.getBaseScore() : BigDecimal.ZERO;
+            
+            // 5. 决定使用下级平均值还是基础分
+            BigDecimal averageScore = lowerLevelAverage.compareTo(BigDecimal.ZERO) > 0 
+                    ? lowerLevelAverage 
+                    : baseScore;
+
+            // 6. 计算当前层级特有加减分
+            Map<String, BigDecimal> 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 specialTotal = addScore.subtract(subtractScore);
+
+            // 7. 最终分值 = 下级平均值(或基础分) + 特有合计
+            BigDecimal finalScore = averageScore.add(specialTotal);
+
+            // 8. 计算贡献分值
+            BigDecimal weight = dim.getWeight() != null ? dim.getWeight() : BigDecimal.ZERO;
+            BigDecimal contribution = finalScore.multiply(weight)
+                    .divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
+
+            // 9. 组装维度得分项
+            GroupPortraitDTO.DimensionScore item = new GroupPortraitDTO.DimensionScore();
+            item.setName(dim.getName());
+            item.setGroupAverageScore(lowerLevelAverage.setScale(2, RoundingMode.HALF_UP));
+            item.setBaseScore(baseScore.setScale(2, RoundingMode.HALF_UP));
+            item.setAddScore(addScore.setScale(2, RoundingMode.HALF_UP));
+            item.setSubtractScore(subtractScore.setScale(2, RoundingMode.HALF_UP));
+            item.setSpecialTotal(specialTotal.setScale(2, RoundingMode.HALF_UP));
+            item.setFinalScore(finalScore.setScale(2, RoundingMode.HALF_UP));
+            item.setWeight(weight);
+            item.setContribution(contribution);
+
+            result.add(item);
+        }
+
+        return result;
+    }
+
+    /**
+     * 根据部门类型确定org值
+     * TEAMS(班组) -> org='2' (小组维度)
+     * MANAGER(主管/队) -> org='1' (队维度)
+     * BRIGADE(大队/部门) -> org='1' (部门维度)
+     * STATION(站) -> org='1' (部门维度)
+     */
+    private String determineOrgByDeptType(String deptType) {
+        if (deptType == null) {
+            return "2"; // 默认小组维度
+        }
+        switch (deptType) {
+            case "TEAMS":
+                return "2"; // 小组维度
+            case "MANAGER":
+            case "BRIGADE":
+            case "STATION":
+                return "1"; // 队/部门维度
+            default:
+                return "2";
+        }
+    }
+
+    /**
+     * 计算下级维度平均值（递归查找）
+     * 层级关系：部门(1) → 队/班组(2) → 小组(3) → 人员(4)
+     * 递进逻辑：
+     * - org=1(部门) → 查询org=2(队)的维度 → 继续递归找org=3 → 继续递归找org=4
+     * - org=2(队) → 查询org=3(小组)的维度 → 继续递归找org=4
+     * - org=3(小组) → 查询org=4(人员)的维度 → 计算人员事件平均
+     * - org=4(人员) → 最底层，直接返回0
+     */
+    private BigDecimal calculateLowerLevelAverage(ScoreDimension currentDim, String beginTime, String endTime) {
+        String dimRelationship = currentDim.getDimRelationship();
+        String currentOrg = currentDim.getOrg();
+        
+        // 1. 如果没有对照关系或已是最底层(org=4)，返回0
+        if (dimRelationship == null || dimRelationship.isEmpty() || "4".equals(currentOrg)) {
+            return BigDecimal.ZERO;
+        }
+        
+        // 2. 查找下一层级的org值
+        String lowerOrg = getLowerLevelOrg(currentOrg);
+        if (lowerOrg == null) {
+            return BigDecimal.ZERO;
+        }
+
+        
+        // 3. 查询下一级维度（通过dimRelationship匹配）
+        ScoreDimension query = new ScoreDimension();
+        query.setDimRelationship(dimRelationship);
+        query.setOrg(lowerOrg);
+        query.setStatus("0");
+        List<ScoreDimension> lowerDims = scoreDimensionMapper.selectList(query);
+        
+        if (lowerDims == null || lowerDims.isEmpty()) {
+            log.warn("未找到下级维度，对照关系: {}, 目标org: {}", dimRelationship, lowerOrg);
+            return BigDecimal.ZERO;
+        }
+        
+        // 取第一个匹配的维度
+        ScoreDimension lowerDim = lowerDims.get(0);
+
+        // 4. 根据下一级的org决定如何处理
+        if ("4".equals(lowerOrg)) {
+            // 下一级是人员维度，计算人员事件平均值
+            return calculatePersonDimensionAverage(lowerDim, beginTime, endTime);
+        } else {
+            // 下一级是组织维度(2或3)，需要继续递归查找更下一级
+            // 例如：部门(1)找队(2)，队(2)还要继续找小组(3)
+            return calculateLowerLevelAverage(lowerDim, beginTime, endTime);
+        }
+    }
+
+    /**
+     * 计算人员维度平均值
+     * 最底层（org=4），查询该维度下的所有人员事件，计算平均分数
+     */
+    private BigDecimal calculatePersonDimensionAverage(ScoreDimension dimension, String beginTime, String endTime) {
+
+        // 查询该维度下的所有事件
+        ScoreEvent eventQuery = new ScoreEvent();
+        eventQuery.setDimensionId(dimension.getId());
+        if (beginTime != null && !beginTime.isEmpty()) {
+            eventQuery.getParams().put("beginTime", beginTime);
+        }
+        if (endTime != null && !endTime.isEmpty()) {
+            eventQuery.getParams().put("endTime", endTime);
+        }
+        List<ScoreEvent> events = scoreEventMapper.selectList(eventQuery);
+
+        if (events == null || events.isEmpty()) {
+            log.info("人员维度无事件数据");
+            return BigDecimal.ZERO;
+        }
+
+        // 按人员分组统计总分
+        Map<String, BigDecimal> personScores = new HashMap<>();
+        for (ScoreEvent e : events) {
+            String personName = e.getPersonName();
+            if (personName == null || personName.trim().isEmpty()) continue;
+
+            // 支持逗号分隔多人
+            String[] names = personName.split("[,，]");
+            for (String name : names) {
+                String trimmedName = name.trim();
+                if (trimmedName.isEmpty()) continue;
+
+                BigDecimal score = e.getTotalScore() != null ? e.getTotalScore() : BigDecimal.ZERO;
+                personScores.merge(trimmedName, score, BigDecimal::add);
+            }
+        }
+
+        if (personScores.isEmpty()) {
+            return BigDecimal.ZERO;
+        }
+        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;
+    }
+
+    /**
+     * 获取下级层级的org值
+     * 层级关系：部门(1) -> 队(2) -> 小组(3) -> 员工(4)
+     */
+    private String getLowerLevelOrg(String currentOrg) {
+        if (currentOrg == null) {
+            return null;
+        }
+        switch (currentOrg) {
+            case "1":
+                return "2";
+            case "2":
+                return "3";
+            case "3":
+                return "4";
+            default:
+                return null;
+        }
+    }
+
+    /**
+     * 计算小组特有加减分
+     * 注：小组特有事件通过org=1(部门级别)筛选
+     */
+    private Map<String, BigDecimal> calculateSpecialScores(Long dimensionId, Long deptId, String beginTime, String endTime,String org) {
+        Map<String, BigDecimal> result = new HashMap<>();
+        result.put("add", BigDecimal.ZERO);
+        result.put("subtract", BigDecimal.ZERO);
+
+        // 查询该部门在该维度的特有事件（org=1表示部门级）
+        ScoreEvent eventQuery = new ScoreEvent();
+        eventQuery.setDimensionId(dimensionId);
+        eventQuery.setDeptId(deptId);
+        eventQuery.setOrg("1"); // 部门级别事件
+        if (beginTime != null && !beginTime.isEmpty()) {
+            eventQuery.getParams().put("beginTime", beginTime);
+        }
+        if (endTime != null && !endTime.isEmpty()) {
+            eventQuery.getParams().put("endTime", endTime);
+        }
+        List<ScoreEvent> events = scoreEventMapper.selectList(eventQuery);
+
+        if (events == null || events.isEmpty()) {
+            return result;
+        }
+
+        // 分别累计加分和减分
+        BigDecimal addTotal = BigDecimal.ZERO;
+        BigDecimal subtractTotal = BigDecimal.ZERO;
+
+        for (ScoreEvent e : events) {
+            BigDecimal score = e.getTotalScore() != null ? e.getTotalScore() : BigDecimal.ZERO;
+            if (score.compareTo(BigDecimal.ZERO) > 0) {
+                addTotal = addTotal.add(score);
+            } else {
+                subtractTotal = subtractTotal.add(score.abs());
+            }
+        }
+
+        result.put("add", addTotal);
+        result.put("subtract", subtractTotal);
+
+        return result;
+    }
+
+    /**
+     * 计算综合评分（各维度贡献分值之和）
+     */
+    private BigDecimal calculateTotalScore(List<GroupPortraitDTO.DimensionScore> dimensions) {
+        BigDecimal total = dimensions.stream()
+                .map(GroupPortraitDTO.DimensionScore::getContribution)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+        return total.setScale(2, RoundingMode.HALF_UP);
+    }
+}

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

@@ -3,22 +3,24 @@
 <mapper namespace="com.sundot.airport.ledger.mapper.ScoreDimensionMapper">
 
     <resultMap id="ScoreDimensionResult" type="com.sundot.airport.ledger.domain.ScoreDimension">
-        <id     property="id"         column="id"/>
-        <result property="name"       column="name"/>
-        <result property="weight"     column="weight"/>
-        <result property="baseScore"  column="base_score"/>
-        <result property="sortOrder"  column="sort_order"/>
-        <result property="status"     column="status"/>
-        <result property="org"     column="org"/>
-        <result property="remark"     column="remark"/>
-        <result property="createBy"   column="create_by"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateBy"   column="update_by"/>
-        <result property="updateTime" column="update_time"/>
+        <id     property="id"             column="id"/>
+        <result property="name"           column="name"/>
+        <result property="weight"         column="weight"/>
+        <result property="baseScore"      column="base_score"/>
+        <result property="sortOrder"      column="sort_order"/>
+        <result property="status"         column="status"/>
+        <result property="org"            column="org"/>
+        <result property="dimRelationship" column="dim_relationship"/>
+        <result property="remark"         column="remark"/>
+        <result property="createBy"       column="create_by"/>
+        <result property="createTime"     column="create_time"/>
+        <result property="updateBy"       column="update_by"/>
+        <result property="updateTime"     column="update_time"/>
     </resultMap>
 
     <sql id="selectVo">
-        SELECT id, name, weight, base_score, sort_order, status, remark,
+        SELECT id, name, weight, base_score, sort_order, status, org,
+               dim_relationship, remark,
                create_by, create_time, update_by, update_time
         FROM score_dimension
         WHERE del_flag = '0'

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

@@ -55,11 +55,11 @@
             resultMap="ScoreEventResult">
         <include refid="selectVo"/>
         <if test="dimensionId != null">AND dimension_id = #{dimensionId}</if>
-        <if test="personId != null">person_id = #{personId}</if>
-        <if test="deptId != null">dept_id = #{deptId}</if>
-        <if test="teamId != null">team_id = #{teamId}</if>
-        <if test="groupId != null">group_id = #{groupId}</if>
-        <if test="org != null and org != ''">org = #{org}</if>
+        <if test="personId != null">AND person_id = #{personId}</if>
+        <if test="deptId != null">AND dept_id = #{deptId}</if>
+        <if test="teamId != null">AND team_id = #{teamId}</if>
+        <if test="groupId != null">AND group_id = #{groupId}</if>
+        <if test="org != null and org != ''">AND org = #{org}</if>
         <if test="personName != null and personName != ''">AND person_name LIKE CONCAT('%', #{personName}, '%')</if>
         <if test="deptName != null and deptName != ''">AND dept_name LIKE CONCAT('%', #{deptName}, '%')</if>
         <if test="teamName != null and teamName != ''">AND team_name LIKE CONCAT('%', #{teamName}, '%')</if>