用户画像修改

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

@@ -29,6 +29,8 @@ public class EmployeePortraitVO {
     private String phonenumber;
     private String birthday;       // 出生日期，从身份证计算
     private String major;          // 专业（新增字段）
+    private String nativePlace;    // 籍贯（新增字段）
+    private String nation;         // 民族（新增字段）
     private String roleNames;      // 职务（来自 sys_role）
     private String postNames;      // 岗位（来自 sys_post）
 
@@ -38,8 +40,16 @@ public class EmployeePortraitVO {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date securityCheckStartDate;
 
-    private Integer workYears;
-    private Integer securityCheckYears;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date entryDate;              // 入职时间（新增字段）
+
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date xrayOperatorStarttime;  // X射线操作员开始时间（新增字段）
+
+    private Integer workYears;           // 工龄
+    private Integer securityCheckYears;  // 安检年限
+    private Integer xrayOperatorYears;   // 开机年限（新增字段）
+    private Integer companyYears;        // 司龄（新增字段）
     private String securityInspectionPosition;
 
     // ── 综合得分 ──────────────────────────────────────────────────────────────
@@ -67,6 +77,9 @@ public class EmployeePortraitVO {
     // ── 质控情况 ──────────────────────────────────────────────────────────────
 
     private Integer qualityControlCount;   // 查获违规品次数
+    private Integer qualityControlEventCount; // 监察问题记录次数
+    private Integer realtimeInterceptionCount; // 实时质控拦截次数
+    private Integer level3QualityControlCount; // 三级质控巡查次数
 
     // ── 配分明细（加分+扣分全量） ──────────────────────────────────────────────
 
@@ -122,6 +135,12 @@ public class EmployeePortraitVO {
     public String getMajor() { return major; }
     public void setMajor(String major) { this.major = major; }
 
+    public String getNativePlace() { return nativePlace; }
+    public void setNativePlace(String nativePlace) { this.nativePlace = nativePlace; }
+
+    public String getNation() { return nation; }
+    public void setNation(String nation) { this.nation = nation; }
+
     public String getRoleNames() { return roleNames; }
     public void setRoleNames(String roleNames) { this.roleNames = roleNames; }
 
@@ -134,12 +153,24 @@ public class EmployeePortraitVO {
     public Date getSecurityCheckStartDate() { return securityCheckStartDate; }
     public void setSecurityCheckStartDate(Date securityCheckStartDate) { this.securityCheckStartDate = securityCheckStartDate; }
 
+    public Date getEntryDate() { return entryDate; }
+    public void setEntryDate(Date entryDate) { this.entryDate = entryDate; }
+
+    public Date getXrayOperatorStarttime() { return xrayOperatorStarttime; }
+    public void setXrayOperatorStarttime(Date xrayOperatorStarttime) { this.xrayOperatorStarttime = xrayOperatorStarttime; }
+
     public Integer getWorkYears() { return workYears; }
     public void setWorkYears(Integer workYears) { this.workYears = workYears; }
 
     public Integer getSecurityCheckYears() { return securityCheckYears; }
     public void setSecurityCheckYears(Integer securityCheckYears) { this.securityCheckYears = securityCheckYears; }
 
+    public Integer getXrayOperatorYears() { return xrayOperatorYears; }
+    public void setXrayOperatorYears(Integer xrayOperatorYears) { this.xrayOperatorYears = xrayOperatorYears; }
+
+    public Integer getCompanyYears() { return companyYears; }
+    public void setCompanyYears(Integer companyYears) { this.companyYears = companyYears; }
+
     public String getSecurityInspectionPosition() { return securityInspectionPosition; }
     public void setSecurityInspectionPosition(String securityInspectionPosition) { this.securityInspectionPosition = securityInspectionPosition; }
 
@@ -167,7 +198,30 @@ public class EmployeePortraitVO {
     public List<AwardRecord> getAwards() { return awards; }
     public void setAwards(List<AwardRecord> awards) { this.awards = awards; }
 
-    // ── 内部类 ────────────────────────────────────────────────────────────────
+    public Integer getQualityControlEventCount() {
+        return qualityControlEventCount;
+    }
+
+    public void setQualityControlEventCount(Integer qualityControlEventCount) {
+        this.qualityControlEventCount = qualityControlEventCount;
+    }
+
+    public Integer getRealtimeInterceptionCount() {
+        return realtimeInterceptionCount;
+    }
+
+    public void setRealtimeInterceptionCount(Integer realtimeInterceptionCount) {
+        this.realtimeInterceptionCount = realtimeInterceptionCount;
+    }
+
+    public Integer getLevel3QualityControlCount() {
+        return level3QualityControlCount;
+    }
+
+    public void setLevel3QualityControlCount(Integer level3QualityControlCount) {
+        this.level3QualityControlCount = level3QualityControlCount;
+    }
+// ── 内部类 ────────────────────────────────────────────────────────────────
 
     public static class DimScoreItem {
         private String name;

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

@@ -9,4 +9,13 @@ import com.sundot.airport.ledger.domain.LedgerPatrolInspection;
  */
 public interface LedgerPatrolInspectionMapper extends BaseMapper<LedgerPatrolInspection> {
     List<LedgerPatrolInspection> selectList(LedgerPatrolInspection query);
+    
+    /**
+     * 根据被查人姓名和时间范围统计三级质控巡查次数
+     * @param inspectedName 被查人姓名
+     * @param beginTime 开始时间
+     * @param endTime 结束时间
+     * @return 巡查次数
+     */
+    int countByInspectedNameAndDateRange(String inspectedName, String beginTime, String endTime);
 }

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

@@ -7,6 +7,7 @@ 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.LedgerExamScoreMapper;
+import com.sundot.airport.ledger.mapper.LedgerPatrolInspectionMapper;
 import com.sundot.airport.ledger.mapper.LedgerSeizureStatsMapper;
 import com.sundot.airport.ledger.mapper.ScoreDimensionMapper;
 import com.sundot.airport.ledger.mapper.ScoreEventMapper;
@@ -52,6 +53,9 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
     @Autowired
     private LedgerSeizureStatsMapper ledgerSeizureStatsMapper;
 
+    @Autowired
+    private LedgerPatrolInspectionMapper ledgerPatrolInspectionMapper;
+
     // ── 搜索员工 ─────────────────────────────────────────────────────────────
 
     @Override
@@ -96,12 +100,42 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
         fillScoreDetails(vo, personName, beginTime, endTime);
 
         // 6. 质控情况
-        int qcCount = ledgerSeizureStatsMapper.countByInspectorAndDateRange(personName, beginTime, endTime);
-        vo.setQualityControlCount(qcCount);
+        fillQualityControl(vo, personName, beginTime, endTime);
+
+
 
         return vo;
     }
 
+    /**
+     * 质控情况
+     * @param vo 输出对象
+     * @param personName 员工姓名
+     * @param beginTime 查询开始时间
+     * @param endTime 查询结束时间
+     */
+    private void fillQualityControl(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);
+        // 查获违规品次数
+        int qcCount = ledgerSeizureStatsMapper.countByInspectorAndDateRange(personName, beginTime, endTime);
+        vo.setQualityControlCount(qcCount);
+        // 监察问题记录次数
+        eq.setDimensionId(1L);
+        eq.setLevel2Name("员工规范化操作");
+        List<ScoreEvent> events = scoreEventMapper.selectList(eq);
+        vo.setQualityControlEventCount(events.size());
+        //实时质控拦截次数
+        eq.setLevel2Name("后台实时质控拦截");
+        List<ScoreEvent>  qcEvents = scoreEventMapper.selectList(eq);
+        vo.setRealtimeInterceptionCount(qcEvents.size());
+        //三级质控巡查次数
+        int patrolCount = ledgerPatrolInspectionMapper.countByInspectedNameAndDateRange(personName, beginTime, endTime);
+        vo.setLevel3QualityControlCount(patrolCount);
+    }
+
     // ── 用户基本信息 ─────────────────────────────────────────────────────────
 
     private void fillUserInfo(EmployeePortraitVO vo, String personName) {
@@ -121,15 +155,20 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
         vo.setSex(user.getSex());
         vo.setSexText("0".equals(user.getSex()) ? "男" : "1".equals(user.getSex()) ? "女" : "");
         vo.setSchooling(user.getSchooling());
+        vo.setMajor(user.getProfessional());
+        vo.setNativePlace(user.getNativePlace());
+        vo.setNation(user.getNation());
         vo.setQualificationLevelText(decodeQualLevel(user.getQualificationLevel()));
         vo.setPoliticalStatusText(decodePolitical(user.getPoliticalStatus()));
         vo.setCharacterCharacteristics(decodeChar(user.getCharacterCharacteristics()));
         vo.setWorkingStyle(decodeWorkStyle(user.getWorkingStyle()));
         vo.setStartWorkingDate(user.getStartWorkingDate());
         vo.setSecurityCheckStartDate(user.getSecurityCheckStartDate());
+        vo.setEntryDate(user.getEntryDate());
+        vo.setXrayOperatorStarttime(user.getXrayOperatorStarttime());
         vo.setSecurityInspectionPosition(user.getSecurityInspectionPosition());
 
-        // 司龄、开机年限
+        // 司龄、工龄、开机年限
         long nowMs = System.currentTimeMillis();
         if (user.getStartWorkingDate() != null) {
             vo.setWorkYears((int) ((nowMs - user.getStartWorkingDate().getTime()) / (365L * 24 * 3600 * 1000)));
@@ -137,6 +176,12 @@ public class EmployeePortraitServiceImpl implements IEmployeePortraitService {
         if (user.getSecurityCheckStartDate() != null) {
             vo.setSecurityCheckYears((int) ((nowMs - user.getSecurityCheckStartDate().getTime()) / (365L * 24 * 3600 * 1000)));
         }
+        if (user.getEntryDate() != null) {
+            vo.setCompanyYears((int) ((nowMs - user.getEntryDate().getTime()) / (365L * 24 * 3600 * 1000)));
+        }
+        if (user.getXrayOperatorStarttime() != null) {
+            vo.setXrayOperatorYears((int) ((nowMs - user.getXrayOperatorStarttime().getTime()) / (365L * 24 * 3600 * 1000)));
+        }
 
         // 出生日期（从18位身份证第7~14位提取）
         String card = user.getCardNumber();

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

@@ -37,6 +37,7 @@
 
     <select id="selectList" parameterType="com.sundot.airport.ledger.domain.LedgerPatrolInspection" resultMap="BaseResultMap">
         <include refid="selectVo"/>
+        WHERE del_flag = '0'
         <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>
         <if test="inspectorName != null and inspectorName != ''">AND inspector_name LIKE CONCAT('%', #{inspectorName}, '%')</if>
@@ -49,4 +50,17 @@
         ORDER BY record_date DESC, id DESC
     </select>
 
+    <select id="countByInspectedNameAndDateRange" resultType="int">
+        SELECT COUNT(*)
+        FROM ledger_patrol_inspection
+        WHERE del_flag = '0'
+          AND inspected_name = #{inspectedName}
+          <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>

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

@@ -50,6 +50,7 @@
         <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>
         <if test="sourceType != null and sourceType != ''">AND source_type = #{sourceType}</if>
+        <if test="level2Name != null and level2Name != ''">AND level2_name LIKE CONCAT('%', #{level2Name}, '%')</if>
         <if test="params != null and params.beginTime != null and params.beginTime != ''">
             AND event_time &gt;= #{params.beginTime}
         </if>