feat: 员工画像接口增强（基本信息、获奖、配分明细、质控）

- EmployeePortraitVO 新增 birthday/major/roleNames/postNames/qualityControlCount/scoreDetails 字段
- AwardRecord 改为 level2/3/4Name + score 结构
- 新增 ScoreDetail 内部类（维度名/二三级指标/分值）
- EmployeePortraitServiceImpl：从身份证提取出生日期，关联查询角色/岗位名称
- fillAwards 改为从 score_event(dimension_id=5) 查询获奖记录
- fillScoreDetails 汇总员工加减分明细列表
- LedgerSeizureStatsMapper 新增 countByInspectorAndDateRange 方法及 XML

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

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

@@ -27,6 +27,10 @@ public class EmployeePortraitVO {
     private String characterCharacteristics;
     private String workingStyle;
     private String phonenumber;
+    private String birthday;       // 出生日期，从身份证计算
+    private String major;          // 专业（新增字段）
+    private String roleNames;      // 职务（来自 sys_role）
+    private String postNames;      // 岗位（来自 sys_post）
 
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date startWorkingDate;
@@ -60,6 +64,14 @@ public class EmployeePortraitVO {
 
     private List<AwardRecord> awards;
 
+    // ── 质控情况 ──────────────────────────────────────────────────────────────
+
+    private Integer qualityControlCount;   // 查获违规品次数
+
+    // ── 配分明细（加分+扣分全量） ──────────────────────────────────────────────
+
+    private List<ScoreDetail> scoreDetails;
+
     // ── getter / setter ───────────────────────────────────────────────────────
 
     public Long getUserId() { return userId; }
@@ -104,6 +116,18 @@ public class EmployeePortraitVO {
     public String getPhonenumber() { return phonenumber; }
     public void setPhonenumber(String phonenumber) { this.phonenumber = phonenumber; }
 
+    public String getBirthday() { return birthday; }
+    public void setBirthday(String birthday) { this.birthday = birthday; }
+
+    public String getMajor() { return major; }
+    public void setMajor(String major) { this.major = major; }
+
+    public String getRoleNames() { return roleNames; }
+    public void setRoleNames(String roleNames) { this.roleNames = roleNames; }
+
+    public String getPostNames() { return postNames; }
+    public void setPostNames(String postNames) { this.postNames = postNames; }
+
     public Date getStartWorkingDate() { return startWorkingDate; }
     public void setStartWorkingDate(Date startWorkingDate) { this.startWorkingDate = startWorkingDate; }
 
@@ -169,23 +193,46 @@ public class EmployeePortraitVO {
     }
 
     public static class AwardRecord {
-        private String type;
-        private String content;
-        private BigDecimal score;
+        private String level2Name;   // 二级指标
+        private String level3Name;   // 三级指标
+        private String level4Name;   // 四级指标
+        private BigDecimal score;    // 获奖情况（分值）
 
-        @JsonFormat(pattern = "yyyy-MM-dd")
-        private Date date;
+        public String getLevel2Name() { return level2Name; }
+        public void setLevel2Name(String level2Name) { this.level2Name = level2Name; }
 
-        public String getType() { return type; }
-        public void setType(String type) { this.type = type; }
+        public String getLevel3Name() { return level3Name; }
+        public void setLevel3Name(String level3Name) { this.level3Name = level3Name; }
 
-        public String getContent() { return content; }
-        public void setContent(String content) { this.content = content; }
+        public String getLevel4Name() { return level4Name; }
+        public void setLevel4Name(String level4Name) { this.level4Name = level4Name; }
 
         public BigDecimal getScore() { return score; }
         public void setScore(BigDecimal score) { this.score = score; }
+    }
+
+    public Integer getQualityControlCount() { return qualityControlCount; }
+    public void setQualityControlCount(Integer qualityControlCount) { this.qualityControlCount = qualityControlCount; }
+
+    public List<ScoreDetail> getScoreDetails() { return scoreDetails; }
+    public void setScoreDetails(List<ScoreDetail> scoreDetails) { this.scoreDetails = scoreDetails; }
+
+    public static class ScoreDetail {
+        private String dimensionName;
+        private String level2Name;
+        private String level3Name;
+        private BigDecimal totalScore;
+
+        public String getDimensionName() { return dimensionName; }
+        public void setDimensionName(String dimensionName) { this.dimensionName = dimensionName; }
+
+        public String getLevel2Name() { return level2Name; }
+        public void setLevel2Name(String level2Name) { this.level2Name = level2Name; }
+
+        public String getLevel3Name() { return level3Name; }
+        public void setLevel3Name(String level3Name) { this.level3Name = level3Name; }
 
-        public Date getDate() { return date; }
-        public void setDate(Date date) { this.date = date; }
+        public BigDecimal getTotalScore() { return totalScore; }
+        public void setTotalScore(BigDecimal totalScore) { this.totalScore = totalScore; }
     }
 }

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

@@ -3,10 +3,15 @@ package com.sundot.airport.ledger.mapper;
 import java.util.List;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.sundot.airport.ledger.domain.LedgerSeizureStats;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 查获违规品统计Mapper接口
  */
 public interface LedgerSeizureStatsMapper extends BaseMapper<LedgerSeizureStats> {
     List<LedgerSeizureStats> selectList(LedgerSeizureStats query);
+
+    int countByInspectorAndDateRange(@Param("inspectorName") String inspectorName,
+                                     @Param("beginTime")     String beginTime,
+                                     @Param("endTime")       String endTime);
 }

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

@@ -2,19 +2,20 @@ 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.LedgerBannerLetter;
 import com.sundot.airport.ledger.domain.LedgerExamScore;
-import com.sundot.airport.ledger.domain.LedgerTerminalBonus;
 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.mapper.LedgerBannerLetterMapper;
 import com.sundot.airport.ledger.mapper.LedgerExamScoreMapper;
-import com.sundot.airport.ledger.mapper.LedgerTerminalBonusMapper;
+import com.sundot.airport.ledger.mapper.LedgerSeizureStatsMapper;
 import com.sundot.airport.ledger.mapper.ScoreDimensionMapper;
 import com.sundot.airport.ledger.mapper.ScoreEventMapper;
 import com.sundot.airport.ledger.service.IEmployeePortraitService;
+import com.sundot.airport.system.domain.SysPost;
+import com.sundot.airport.common.core.domain.entity.SysRole;
 import com.sundot.airport.system.mapper.SysDeptMapper;
+import com.sundot.airport.system.mapper.SysPostMapper;
+import com.sundot.airport.system.mapper.SysRoleMapper;
 import com.sundot.airport.system.mapper.SysUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -34,6 +35,12 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
     private SysDeptMapper sysDeptMapper;
 
     @Autowired
+    private SysRoleMapper sysRoleMapper;
+
+    @Autowired
+    private SysPostMapper sysPostMapper;
+
+    @Autowired
     private ScoreEventMapper scoreEventMapper;
 
     @Autowired
@@ -43,10 +50,7 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
     private LedgerExamScoreMapper ledgerExamScoreMapper;
 
     @Autowired
-    private LedgerBannerLetterMapper ledgerBannerLetterMapper;
-
-    @Autowired
-    private LedgerTerminalBonusMapper ledgerTerminalBonusMapper;
+    private LedgerSeizureStatsMapper ledgerSeizureStatsMapper;
 
     // ── 搜索员工 ─────────────────────────────────────────────────────────────
 
@@ -85,9 +89,16 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
         // 3. 最新考试成绩
         fillExamScore(vo, personName);
 
-        // 4. 获奖记录（锦旗/感谢信 + 航站楼加分）
+        // 4. 获奖记录
         fillAwards(vo, personName);
 
+        // 5. 配分明细（全量加减分）
+        fillScoreDetails(vo, personName, beginTime, endTime);
+
+        // 6. 质控情况
+        int qcCount = ledgerSeizureStatsMapper.countByInspectorAndDateRange(personName, beginTime, endTime);
+        vo.setQualityControlCount(qcCount);
+
         return vo;
     }
 
@@ -127,6 +138,33 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
             vo.setSecurityCheckYears((int) ((nowMs - user.getSecurityCheckStartDate().getTime()) / (365L * 24 * 3600 * 1000)));
         }
 
+        // 出生日期（从18位身份证第7~14位提取）
+        String card = user.getCardNumber();
+        if (card != null && card.length() >= 14) {
+            String bd = card.substring(6, 14);
+            vo.setBirthday(bd.substring(0, 4) + "-" + bd.substring(4, 6) + "-" + bd.substring(6, 8));
+        }
+
+        // 职务（sys_role）
+        List<SysRole> roles = sysRoleMapper.selectRolesByUserName(user.getUserName());
+        if (roles != null && !roles.isEmpty()) {
+            String rn = roles.stream()
+                    .map(SysRole::getRoleName)
+                    .filter(s -> s != null && !s.isEmpty())
+                    .collect(Collectors.joining("、"));
+            vo.setRoleNames(rn);
+        }
+
+        // 岗位（sys_post）
+        List<SysPost> posts = sysPostMapper.selectPostsByUserName(user.getUserName());
+        if (posts != null && !posts.isEmpty()) {
+            String pn = posts.stream()
+                    .map(SysPost::getPostName)
+                    .filter(s -> s != null && !s.isEmpty())
+                    .collect(Collectors.joining("、"));
+            vo.setPostNames(pn);
+        }
+
         // 部门路径
         if (user.getDept() != null) {
             String deptName = user.getDept().getDeptName();
@@ -225,40 +263,57 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
 
     // ── 获奖记录 ──────────────────────────────────────────────────────────────
 
-    private void fillAwards(EmployeePortraitVO vo, String personName) {
-        List<EmployeePortraitVO.AwardRecord> awards = new ArrayList<>();
+    private void fillScoreDetails(EmployeePortraitVO vo, String personName, String beginTime, String endTime) {
+        ScoreEvent eq = new ScoreEvent();
+        eq.setPersonName(personName);
+        if (beginTime != null && !beginTime.isEmpty()) eq.getParams().put("beginTime", beginTime);
+        if (endTime   != null && !endTime.isEmpty())   eq.getParams().put("endTime",   endTime);
+        List<ScoreEvent> events = scoreEventMapper.selectList(eq);
 
-        // 锦旗及感谢信
-        LedgerBannerLetter bq = new LedgerBannerLetter();
-        bq.setPersonName(personName);
-        for (LedgerBannerLetter b : ledgerBannerLetterMapper.selectList(bq)) {
-            EmployeePortraitVO.AwardRecord ar = new EmployeePortraitVO.AwardRecord();
-            ar.setType("1".equals(b.getType()) ? "锦旗" : "感谢信");
-            ar.setContent(b.getContentDesc());
-            ar.setScore(b.getAddScore());
-            ar.setDate(b.getRecordDate());
-            awards.add(ar);
+        List<EmployeePortraitVO.ScoreDetail> details = new ArrayList<>();
+        for (ScoreEvent e : events) {
+            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;
+
+            EmployeePortraitVO.ScoreDetail d = new EmployeePortraitVO.ScoreDetail();
+            d.setDimensionName(e.getDimensionName());
+            d.setLevel2Name(e.getLevel2Name());
+            d.setLevel3Name(e.getLevel3Name());
+            d.setTotalScore(e.getTotalScore());
+            details.add(d);
         }
+        vo.setScoreDetails(details);
+    }
+
+    private void fillAwards(EmployeePortraitVO vo, String personName) {
+        // 群团协作能力 dimension_id = 5
+        ScoreEvent eq = new ScoreEvent();
+        eq.setPersonName(personName);
+        eq.setDimensionId(5L);
+        List<ScoreEvent> events = scoreEventMapper.selectList(eq);
+
+        List<EmployeePortraitVO.AwardRecord> awards = new ArrayList<>();
+        for (ScoreEvent e : events) {
+            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;
 
-        // 航站楼加分
-        LedgerTerminalBonus tq = new LedgerTerminalBonus();
-        tq.setPersonName(personName);
-        for (LedgerTerminalBonus t : ledgerTerminalBonusMapper.selectList(tq)) {
             EmployeePortraitVO.AwardRecord ar = new EmployeePortraitVO.AwardRecord();
-            ar.setType("航站楼加分");
-            ar.setContent(t.getBonusType());
-            ar.setScore(t.getAddScore());
-            ar.setDate(t.getApproveDate());
+            ar.setLevel3Name(e.getLevel3Name());
+            ar.setLevel2Name(e.getLevel2Name());
+            ar.setLevel4Name(e.getLevel4Name());
+            ar.setScore(e.getTotalScore());
             awards.add(ar);
         }
-
-        // 按日期降序
-        awards.sort((a, b) -> {
-            if (a.getDate() == null) return 1;
-            if (b.getDate() == null) return -1;
-            return b.getDate().compareTo(a.getDate());
-        });
-
         vo.setAwards(awards);
     }
 

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

@@ -50,4 +50,18 @@
         ORDER BY id DESC
     </select>
 
+
+    <select id="countByInspectorAndDateRange" resultType="int">
+        SELECT count(*)
+        FROM ledger_seizure_stats
+        WHERE del_flag = '0'
+          AND inspector_name = #{inspectorName}
+          <if test="beginTime != null and beginTime != ''">
+              AND record_date &gt;= STR_TO_DATE(#{beginTime}, '%Y-%m-%d')
+          </if>
+          <if test="endTime != null and endTime != ''">
+              AND record_date &lt;= STR_TO_DATE(#{endTime}, '%Y-%m-%d')
+          </if>
+    </select>
+
 </mapper>