Merge remote-tracking branch 'origin/master'

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

@@ -17,6 +17,7 @@ import com.sundot.airport.common.core.controller.BaseController;
 import com.sundot.airport.common.core.domain.AjaxResult;
 import com.sundot.airport.common.enums.BusinessType;
 import com.sundot.airport.ledger.domain.LedgerCertificateInfo;
+import com.sundot.airport.ledger.dto.LedgerCertificateImportTemplate;
 import com.sundot.airport.ledger.service.ILedgerCertificateInfoService;
 import com.sundot.airport.common.utils.poi.ExcelUtil;
 import com.sundot.airport.common.core.page.TableDataInfo;
@@ -76,6 +77,10 @@ public class LedgerCertificateInfoController extends BaseController {
     @Log(title = "证书信息", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody LedgerCertificateInfo ledgerCertificateInfo) {
+        String errorMsg = validateCertificateInfo(ledgerCertificateInfo);
+        if (errorMsg != null) {
+            return error(errorMsg);
+        }
         return toAjax(certificateInfoService.insertCertificateInfo(ledgerCertificateInfo));
     }
 
@@ -86,6 +91,10 @@ public class LedgerCertificateInfoController extends BaseController {
     @Log(title = "证书信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody LedgerCertificateInfo ledgerCertificateInfo) {
+        String errorMsg = validateCertificateInfo(ledgerCertificateInfo);
+        if (errorMsg != null) {
+            return error(errorMsg);
+        }
         return toAjax(certificateInfoService.updateCertificateInfo(ledgerCertificateInfo));
     }
 
@@ -126,7 +135,35 @@ public class LedgerCertificateInfoController extends BaseController {
      */
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response) {
-        ExcelUtil<LedgerCertificateInfo> util = new ExcelUtil<LedgerCertificateInfo>(LedgerCertificateInfo.class);
+        ExcelUtil<LedgerCertificateImportTemplate> util = new ExcelUtil<>(LedgerCertificateImportTemplate.class);
         util.importTemplateExcel(response, "证书信息数据");
     }
+
+    /**
+     * 校验证书信息必填参数
+     * 
+     * @param cert 证书信息
+     * @return 校验失败返回错误信息，校验通过返回null
+     */
+    private String validateCertificateInfo(LedgerCertificateInfo cert) {
+        if (cert == null) {
+            return "证书信息不能为空";
+        }
+        if (cert.getPersonName() == null || cert.getPersonName().trim().isEmpty()) {
+            return "姓名不能为空";
+        }
+        if (cert.getCertLevel() == null || cert.getCertLevel().trim().isEmpty()) {
+            return "证书等级不能为空";
+        }
+        if (cert.getIssueDate() == null) {
+            return "发证日期不能为空";
+        }
+        if (cert.getServiceMonths() == null) {
+            return "服务期(月)不能为空";
+        }
+        if (cert.getReviewRecords() == null || cert.getReviewRecords().isEmpty()) {
+            return "复审记录不能为空";
+        }
+        return null;
+    }
 }

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

@@ -108,7 +108,7 @@ public class LedgerCertificateInfo extends BaseEntity {
      * 评定成绩
      */
     @Excel(name = "评定成绩")
-    private BigDecimal evalScore;
+    private String evalScore;
 
     /**
      * 用工形式
@@ -126,19 +126,16 @@ public class LedgerCertificateInfo extends BaseEntity {
      * 到期日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "到期日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date expiryDate;
 
     /**
      * 状态
      */
-    @Excel(name = "状态")
     private String status;
 
     /**
      * 到期天数
      */
-    @Excel(name = "到期天数")
     private Integer expireDays;
 
     /**
@@ -148,6 +145,11 @@ public class LedgerCertificateInfo extends BaseEntity {
     private String remark;
 
     /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
+
+    /**
      * 复审记录列表(非数据库字段)
      */
     @TableField(exist = false)
@@ -257,11 +259,11 @@ public class LedgerCertificateInfo extends BaseEntity {
         return practiceScore;
     }
 
-    public void setEvalScore(BigDecimal evalScore) {
+    public void setEvalScore(String evalScore) {
         this.evalScore = evalScore;
     }
 
-    public BigDecimal getEvalScore() {
+    public String getEvalScore() {
         return evalScore;
     }
 
@@ -313,6 +315,14 @@ public class LedgerCertificateInfo extends BaseEntity {
         return remark;
     }
 
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public String getDelFlag() {
+        return delFlag;
+    }
+
     public void setReviewRecords(List<LedgerCertificateReviewRecord> reviewRecords) {
         this.reviewRecords = reviewRecords;
     }

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

@@ -12,7 +12,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
- * 证书复审记录对象 certificate_review_record
+ * 证书复审记录对象 ledger_certificate_review_record
  *
  * @author ruoyi
  * @date 2026-06-29
@@ -52,6 +52,11 @@ public class LedgerCertificateReviewRecord extends BaseEntity {
     @Excel(name = "备注")
     private String remark;
 
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
+
     public void setId(Long id) {
         this.id = id;
     }
@@ -84,11 +89,18 @@ public class LedgerCertificateReviewRecord extends BaseEntity {
         return reviewTime;
     }
 
+    public void setDelFlag(String delFlag) {
+        this.delFlag = delFlag;
+    }
 
+    public String getDelFlag() {
+        return delFlag;
+    }
     public void setRemark(String remark) {
         this.remark = remark;
     }
 
+
     public String getRemark() {
         return remark;
     }
@@ -101,6 +113,7 @@ public class LedgerCertificateReviewRecord extends BaseEntity {
                 .append("reviewSeq", getReviewSeq())
                 .append("reviewTime", getReviewTime())
                 .append("remark", getRemark())
+                .append("delFlag", getDelFlag())
                 .toString();
     }
 }

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

@@ -1,231 +0,0 @@
-package com.sundot.airport.ledger.dto;
-
-import java.util.Date;
-
-import com.sundot.airport.common.annotation.Excel;
-import com.sundot.airport.common.core.domain.BaseEntity;
-
-/**
- * 证书信息导入对象(用于Excel导入)
- * 
- * @author ruoyi
- * @date 2026-06-29
- */
-public class LedgerCertificateImportDTO extends BaseEntity {
-    
-    @Excel(name = "序号")
-    private Integer rowNum;
-    
-    @Excel(name = "单位")
-    private String unitName;
-    
-    @Excel(name = "姓名")
-    private String personName;
-    
-    @Excel(name = "性别")
-    private String gender;
-    
-    @Excel(name = "出生日期", dateFormat = "yyyy-MM-dd")
-    private Date birthDate;
-    
-    @Excel(name = "身份证号")
-    private String idCard;
-    
-    @Excel(name = "证书等级")
-    private String certLevel;
-    
-    @Excel(name = "发证日期", dateFormat = "yyyy-MM-dd")
-    private Date issueDate;
-    
-    @Excel(name = "证书编号")
-    private String certNo;
-    
-    @Excel(name = "理论考核成绩")
-    private Double theoryScore;
-    
-    @Excel(name = "实操考核成绩")
-    private Double practiceScore;
-    
-    @Excel(name = "评定成绩")
-    private Double evalScore;
-    
-    @Excel(name = "用工形式")
-    private String employmentType;
-    
-    @Excel(name = "服务期（月）")
-    private Integer serviceMonths;
-    
-    @Excel(name = "到期日期", dateFormat = "yyyy-MM-dd")
-    private Date expiryDate;
-    
-    @Excel(name = "状态")
-    private String status;
-    
-    @Excel(name = "到期天数")
-    private Integer expireDays;
-    
-    @Excel(name = "备注")
-    private String remark;
-    
-    // 注意:复审时间不在这里定义,因为数量不固定
-    // 在导入时需要动态解析"第1次复审时间"、"第2次复审时间"等列
-    
-    /**
-     * 动态字段:存储所有复审时间
-     * Key: 复审次序(1,2,3...)
-     * Value: 复审时间
-     */
-    private java.util.Map<Integer, Date> reviewTimeMap;
-
-    public Integer getRowNum() {
-        return rowNum;
-    }
-
-    public void setRowNum(Integer rowNum) {
-        this.rowNum = rowNum;
-    }
-
-    public String getUnitName() {
-        return unitName;
-    }
-
-    public void setUnitName(String unitName) {
-        this.unitName = unitName;
-    }
-
-    public String getPersonName() {
-        return personName;
-    }
-
-    public void setPersonName(String personName) {
-        this.personName = personName;
-    }
-
-    public String getGender() {
-        return gender;
-    }
-
-    public void setGender(String gender) {
-        this.gender = gender;
-    }
-
-    public Date getBirthDate() {
-        return birthDate;
-    }
-
-    public void setBirthDate(Date birthDate) {
-        this.birthDate = birthDate;
-    }
-
-    public String getIdCard() {
-        return idCard;
-    }
-
-    public void setIdCard(String idCard) {
-        this.idCard = idCard;
-    }
-
-    public String getCertLevel() {
-        return certLevel;
-    }
-
-    public void setCertLevel(String certLevel) {
-        this.certLevel = certLevel;
-    }
-
-    public Date getIssueDate() {
-        return issueDate;
-    }
-
-    public void setIssueDate(Date issueDate) {
-        this.issueDate = issueDate;
-    }
-
-    public String getCertNo() {
-        return certNo;
-    }
-
-    public void setCertNo(String certNo) {
-        this.certNo = certNo;
-    }
-
-    public Double getTheoryScore() {
-        return theoryScore;
-    }
-
-    public void setTheoryScore(Double theoryScore) {
-        this.theoryScore = theoryScore;
-    }
-
-    public Double getPracticeScore() {
-        return practiceScore;
-    }
-
-    public void setPracticeScore(Double practiceScore) {
-        this.practiceScore = practiceScore;
-    }
-
-    public Double getEvalScore() {
-        return evalScore;
-    }
-
-    public void setEvalScore(Double evalScore) {
-        this.evalScore = evalScore;
-    }
-
-    public String getEmploymentType() {
-        return employmentType;
-    }
-
-    public void setEmploymentType(String employmentType) {
-        this.employmentType = employmentType;
-    }
-
-    public Integer getServiceMonths() {
-        return serviceMonths;
-    }
-
-    public void setServiceMonths(Integer serviceMonths) {
-        this.serviceMonths = serviceMonths;
-    }
-
-    public Date getExpiryDate() {
-        return expiryDate;
-    }
-
-    public void setExpiryDate(Date expiryDate) {
-        this.expiryDate = expiryDate;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Integer getExpireDays() {
-        return expireDays;
-    }
-
-    public void setExpireDays(Integer expireDays) {
-        this.expireDays = expireDays;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public java.util.Map<Integer, Date> getReviewTimeMap() {
-        return reviewTimeMap;
-    }
-
-    public void setReviewTimeMap(java.util.Map<Integer, Date> reviewTimeMap) {
-        this.reviewTimeMap = reviewTimeMap;
-    }
-}

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

@@ -0,0 +1,134 @@
+package com.sundot.airport.ledger.dto;
+
+import java.util.Date;
+
+import com.sundot.airport.common.annotation.Excel;
+
+/**
+ * 证书信息导入模板对象（仅用于生成Excel导入模板，不参与业务逻辑）
+ *
+ * @author ruoyi
+ */
+public class LedgerCertificateImportTemplate {
+
+    @Excel(name = "姓名")
+    private String personName;
+
+    @Excel(name = "单位")
+    private String unitName;
+
+    @Excel(name = "性别", readConverterExp = "男=男,女=女")
+    private String gender;
+
+    @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date birthDate;
+
+    @Excel(name = "身份证号")
+    private String idCard;
+
+    @Excel(name = "证书等级")
+    private String certLevel;
+
+    @Excel(name = "发证日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date issueDate;
+
+    @Excel(name = "证书编号")
+    private String certNo;
+
+    @Excel(name = "理论考核成绩")
+    private Double theoryScore;
+
+    @Excel(name = "实操考核成绩")
+    private Double practiceScore;
+
+    @Excel(name = "评定成绩")
+    private String evalScore;
+
+    @Excel(name = "用工形式")
+    private String employmentType;
+
+    @Excel(name = "服务期（月）")
+    private Integer serviceMonths;
+
+    @Excel(name = "备注")
+    private String remark;
+
+    @Excel(name = "第一次复审时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reviewTime1;
+
+    @Excel(name = "第二次复审时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reviewTime2;
+
+    @Excel(name = "第三次复审时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reviewTime3;
+
+    @Excel(name = "第四次复审时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reviewTime4;
+
+    @Excel(name = "第五次复审时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reviewTime5;
+
+    @Excel(name = "第六次复审时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date reviewTime6;
+
+
+    public String getUnitName() { return unitName; }
+    public void setUnitName(String unitName) { this.unitName = unitName; }
+
+    public String getPersonName() { return personName; }
+    public void setPersonName(String personName) { this.personName = personName; }
+
+    public String getGender() { return gender; }
+    public void setGender(String gender) { this.gender = gender; }
+
+    public Date getBirthDate() { return birthDate; }
+    public void setBirthDate(Date birthDate) { this.birthDate = birthDate; }
+
+    public String getIdCard() { return idCard; }
+    public void setIdCard(String idCard) { this.idCard = idCard; }
+
+    public String getCertLevel() { return certLevel; }
+    public void setCertLevel(String certLevel) { this.certLevel = certLevel; }
+
+    public Date getIssueDate() { return issueDate; }
+    public void setIssueDate(Date issueDate) { this.issueDate = issueDate; }
+
+    public String getCertNo() { return certNo; }
+    public void setCertNo(String certNo) { this.certNo = certNo; }
+
+    public Double getTheoryScore() { return theoryScore; }
+    public void setTheoryScore(Double theoryScore) { this.theoryScore = theoryScore; }
+
+    public Double getPracticeScore() { return practiceScore; }
+    public void setPracticeScore(Double practiceScore) { this.practiceScore = practiceScore; }
+
+    public String getEvalScore() { return evalScore; }
+    public void setEvalScore(String evalScore) { this.evalScore = evalScore; }
+
+    public String getEmploymentType() { return employmentType; }
+    public void setEmploymentType(String employmentType) { this.employmentType = employmentType; }
+
+    public Integer getServiceMonths() { return serviceMonths; }
+    public void setServiceMonths(Integer serviceMonths) { this.serviceMonths = serviceMonths; }
+
+    public String getRemark() { return remark; }
+    public void setRemark(String remark) { this.remark = remark; }
+
+    public Date getReviewTime1() { return reviewTime1; }
+    public void setReviewTime1(Date reviewTime1) { this.reviewTime1 = reviewTime1; }
+
+    public Date getReviewTime2() { return reviewTime2; }
+    public void setReviewTime2(Date reviewTime2) { this.reviewTime2 = reviewTime2; }
+
+    public Date getReviewTime3() { return reviewTime3; }
+    public void setReviewTime3(Date reviewTime3) { this.reviewTime3 = reviewTime3; }
+
+    public Date getReviewTime4() { return reviewTime4; }
+    public void setReviewTime4(Date reviewTime4) { this.reviewTime4 = reviewTime4; }
+
+    public Date getReviewTime5() { return reviewTime5; }
+    public void setReviewTime5(Date reviewTime5) { this.reviewTime5 = reviewTime5; }
+
+    public Date getReviewTime6() { return reviewTime6; }
+    public void setReviewTime6(Date reviewTime6) { this.reviewTime6 = reviewTime6; }
+}

airport-ledger/src/main/java/com/sundot/airport/ledger/enums/CertificateStatusEnum.java

@@ -0,0 +1,61 @@
+package com.sundot.airport.ledger.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 证书状态枚举
+ * 
+ * @author ruoyi
+ */
+@Getter
+@AllArgsConstructor
+public enum CertificateStatusEnum {
+
+    NORMAL("NORMAL", "正常"),
+    RETRAINING("RETRAINING", "复训"),
+    EXPIRED("EXPIRED", "到期");
+
+    private final String code;
+    private final String desc;
+
+    /**
+     * 根据 code 获取枚举
+     */
+    public static CertificateStatusEnum getByCode(String code) {
+        for (CertificateStatusEnum itemEnum : values()) {
+            if (itemEnum.getCode().equals(code)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 根据描述获取枚举
+     */
+    public static CertificateStatusEnum getByDesc(String desc) {
+        for (CertificateStatusEnum itemEnum : values()) {
+            if (itemEnum.getDesc().equals(desc)) {
+                return itemEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 根据到期天数计算证书状态
+     * 
+     * @param expireDays 到期天数
+     * @return 证书状态枚举
+     */
+    public static CertificateStatusEnum calculateByExpireDays(int expireDays) {
+        if (expireDays > 180) {
+            return NORMAL;
+        } else if (expireDays > 0) {
+            return RETRAINING;
+        } else {
+            return EXPIRED;
+        }
+    }
+}

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

@@ -83,4 +83,60 @@ public interface LedgerCertificateInfoMapper {
      * @return 证书信息
      */
     public LedgerCertificateInfo selectCertificateInfoByUserIdAndCertNo(@Param("userId") Long userId, @Param("certNo") String certNo);
+
+    /**
+     * 根据用户ID和证书等级查询证书信息
+     * 
+     * @param userId 用户ID
+     * @param certLevel 证书等级
+     * @return 证书信息
+     */
+    public LedgerCertificateInfo selectCertificateInfoByUserIdAndCertLevel(@Param("userId") Long userId, @Param("certLevel") String certLevel);
+
+    /**
+     * 根据用户ID查询该用户所有证书信息
+     * 
+     * @param userId 用户ID
+     * @return 证书信息列表
+     */
+    public List<LedgerCertificateInfo> selectCertificateInfoByUserId(@Param("userId") Long userId);
+
+    /**
+     * 查询所有有效证书信息（用于定时任务）
+     * 
+     * @return 证书信息列表
+     */
+    public List<LedgerCertificateInfo> selectAllCertificateInfo();
+
+    /**
+     * 批量更新证书到期信息
+     * 
+     * @param ledgerCertificateInfo 证书信息（包含expiryDate, expireDays, status）
+     * @return 结果
+     */
+    public int updateCertificateExpiryInfo(LedgerCertificateInfo ledgerCertificateInfo);
+
+    /**
+     * 根据userId和certLevel组合条件批量查询已存在的证书
+     * 
+     * @param list 证书列表（只需设置userId和certLevel）
+     * @return 已存在的证书列表
+     */
+    List<LedgerCertificateInfo> selectExistingCertificates(@Param("list") List<LedgerCertificateInfo> list);
+
+    /**
+     * 批量插入证书信息
+     * 
+     * @param list 证书列表
+     * @return 结果
+     */
+    int batchInsertCertificateInfo(@Param("list") List<LedgerCertificateInfo> list);
+
+    /**
+     * 批量更新证书信息
+     * 
+     * @param list 证书列表
+     * @return 结果
+     */
+    int batchUpdateCertificateInfo(@Param("list") List<LedgerCertificateInfo> list);
 }

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

@@ -1,6 +1,7 @@
 package com.sundot.airport.ledger.mapper;
 
 import java.util.List;
+import org.apache.ibatis.annotations.Param;
 import com.sundot.airport.ledger.domain.LedgerCertificateReviewRecord;
 
 /**
@@ -73,4 +74,20 @@ public interface LedgerCertificateReviewRecordMapper {
      * @return 结果
      */
     public int deleteCertificateReviewRecordByCertId(Long certId);
+
+    /**
+     * 根据多个证书ID批量删除复审记录
+     * 
+     * @param certIds 证书ID列表
+     * @return 结果
+     */
+    public int deleteReviewRecordsByCertIds(@Param("certIds") List<Long> certIds);
+
+    /**
+     * 批量插入复审记录
+     * 
+     * @param list 复审记录列表
+     * @return 结果
+     */
+    public int batchInsertReviewRecords(@Param("list") List<LedgerCertificateReviewRecord> list);
 }

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

@@ -67,4 +67,23 @@ public interface ILedgerCertificateInfoService {
      * @return 结果
      */
     public String importCertificate(List<LedgerCertificateInfo> certificateList, Boolean isUpdateSupport, String operName);
+
+    /**
+     * 计算证书到期信息（到期日期、到期天数、状态）
+     * 
+     * @param certificate 证书信息
+     */
+    public void calculateExpiryInfo(LedgerCertificateInfo certificate);
+
+    /**
+     * 重新计算用户资质等级（根据用户所有证书到期状态）
+     * 
+     * @param userId 用户ID
+     */
+    public void recalculateUserQualification(Long userId);
+
+    /**
+     * 每日定时更新证书到期信息
+     */
+    public void dailyUpdateExpiryInfo();
 }

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

@@ -1,11 +1,15 @@
 package com.sundot.airport.ledger.service.impl;
 
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -15,6 +19,7 @@ import com.sundot.airport.ledger.mapper.LedgerCertificateInfoMapper;
 import com.sundot.airport.ledger.mapper.LedgerCertificateReviewRecordMapper;
 import com.sundot.airport.ledger.domain.LedgerCertificateInfo;
 import com.sundot.airport.ledger.domain.LedgerCertificateReviewRecord;
+import com.sundot.airport.ledger.enums.CertificateStatusEnum;
 import com.sundot.airport.ledger.service.ILedgerCertificateInfoService;
 import com.sundot.airport.system.service.ISysUserService;
 
@@ -26,6 +31,8 @@ import com.sundot.airport.system.service.ISysUserService;
  */
 @Service
 public class LedgerLedgerCertificateInfoServiceImpl implements ILedgerCertificateInfoService {
+    private static final Logger log = LoggerFactory.getLogger(LedgerLedgerCertificateInfoServiceImpl.class);
+
     @Autowired
     private LedgerCertificateInfoMapper ledgerCertificateInfoMapper;
 
@@ -73,11 +80,20 @@ public class LedgerLedgerCertificateInfoServiceImpl implements ILedgerCertificat
     @Transactional
     public int insertCertificateInfo(LedgerCertificateInfo ledgerCertificateInfo) {
         ledgerCertificateInfo.setCreateTime(DateUtils.getNowDate());
+        
+        // 计算到期信息
+        calculateExpiryInfo(ledgerCertificateInfo);
+        
         int rows = ledgerCertificateInfoMapper.insertCertificateInfo(ledgerCertificateInfo);
         
         // 保存复审记录
         saveReviewRecords(ledgerCertificateInfo.getId(), ledgerCertificateInfo.getReviewRecords());
         
+        // 同步用户资质等级
+        if (ledgerCertificateInfo.getUserId() != null) {
+            recalculateUserQualification(ledgerCertificateInfo.getUserId());
+        }
+        
         return rows;
     }
 
@@ -91,12 +107,21 @@ public class LedgerLedgerCertificateInfoServiceImpl implements ILedgerCertificat
     @Transactional
     public int updateCertificateInfo(LedgerCertificateInfo ledgerCertificateInfo) {
         ledgerCertificateInfo.setUpdateTime(DateUtils.getNowDate());
+        
+        // 计算到期信息
+        calculateExpiryInfo(ledgerCertificateInfo);
+        
         int rows = ledgerCertificateInfoMapper.updateCertificateInfo(ledgerCertificateInfo);
         
         // 先删除旧的复审记录，再保存新的
         ledgerCertificateReviewRecordMapper.deleteCertificateReviewRecordByCertId(ledgerCertificateInfo.getId());
         saveReviewRecords(ledgerCertificateInfo.getId(), ledgerCertificateInfo.getReviewRecords());
         
+        // 同步用户资质等级
+        if (ledgerCertificateInfo.getUserId() != null) {
+            recalculateUserQualification(ledgerCertificateInfo.getUserId());
+        }
+        
         return rows;
     }
 
@@ -109,11 +134,23 @@ public class LedgerLedgerCertificateInfoServiceImpl implements ILedgerCertificat
     @Override
     @Transactional
     public int deleteCertificateInfoByIds(Long[] ids) {
-        // 删除复审记录
+        // 收集需要刷新资质的userId
+        List<Long> userIds = new ArrayList<>();
         for (Long id : ids) {
+            LedgerCertificateInfo cert = ledgerCertificateInfoMapper.selectCertificateInfoById(id);
+            if (cert != null && cert.getUserId() != null) {
+                userIds.add(cert.getUserId());
+            }
             ledgerCertificateReviewRecordMapper.deleteCertificateReviewRecordByCertId(id);
         }
-        return ledgerCertificateInfoMapper.deleteCertificateInfoByIds(ids);
+        int rows = ledgerCertificateInfoMapper.deleteCertificateInfoByIds(ids);
+        
+        // 同步用户资质等级
+        for (Long userId : userIds) {
+            recalculateUserQualification(userId);
+        }
+        
+        return rows;
     }
 
     /**
@@ -125,9 +162,17 @@ public class LedgerLedgerCertificateInfoServiceImpl implements ILedgerCertificat
     @Override
     @Transactional
     public int deleteCertificateInfoById(Long id) {
+        LedgerCertificateInfo cert = ledgerCertificateInfoMapper.selectCertificateInfoById(id);
         // 删除复审记录
         ledgerCertificateReviewRecordMapper.deleteCertificateReviewRecordByCertId(id);
-        return ledgerCertificateInfoMapper.deleteCertificateInfoById(id);
+        int rows = ledgerCertificateInfoMapper.deleteCertificateInfoById(id);
+        
+        // 同步用户资质等级
+        if (cert != null && cert.getUserId() != null) {
+            recalculateUserQualification(cert.getUserId());
+        }
+        
+        return rows;
     }
 
     /**
@@ -145,11 +190,6 @@ public class LedgerLedgerCertificateInfoServiceImpl implements ILedgerCertificat
             throw new RuntimeException("导入证书数据不能为空！");
         }
         
-        int successNum = 0;
-        int failureNum = 0;
-        StringBuilder successMsg = new StringBuilder();
-        StringBuilder failureMsg = new StringBuilder();
-        
         // 第一步: 收集所有姓名，批量查询用户信息
         List<String> personNames = certificateList.stream()
                 .map(LedgerCertificateInfo::getPersonName)
@@ -163,7 +203,6 @@ public class LedgerLedgerCertificateInfoServiceImpl implements ILedgerCertificat
         // 构建姓名到用户的映射 Map<姓名, SysUser>
         Map<String, SysUser> userMap = new HashMap<>();
         for (SysUser user : users) {
-            // 优先使用 nickName（用户名称），如果没有则使用 userName（登录名称）
             String key = user.getNickName() != null && !user.getNickName().isEmpty() 
                     ? user.getNickName() : user.getUserName();
             userMap.put(key, user);
@@ -177,7 +216,6 @@ public class LedgerLedgerCertificateInfoServiceImpl implements ILedgerCertificat
             }
         }
         
-        // 如果有未找到的用户，报错提醒
         if (!notFoundNames.isEmpty()) {
             throw new RuntimeException("以下人员未在系统中找到：" + String.join("、", notFoundNames));
         }
@@ -191,77 +229,102 @@ public class LedgerLedgerCertificateInfoServiceImpl implements ILedgerCertificat
             }
         }
         
-        // 第四步: 批量查询已存在的证书信息（根据 userId 和 certNo）
+        // 第四步: 批量查询已存在的证书
+        List<LedgerCertificateInfo> queryKeys = certificateList.stream()
+                .filter(c -> c.getUserId() != null && c.getCertLevel() != null)
+                .collect(Collectors.toList());
+        
         Map<String, LedgerCertificateInfo> existingCertMap = new HashMap<>();
-        for (LedgerCertificateInfo certificate : certificateList) {
-            if (certificate.getUserId() != null && certificate.getCertNo() != null) {
-                LedgerCertificateInfo existCert = ledgerCertificateInfoMapper.selectCertificateInfoByUserIdAndCertNo(
-                        certificate.getUserId(), certificate.getCertNo());
-                if (existCert != null) {
-                    String key = certificate.getUserId() + "_" + certificate.getCertNo();
-                    existingCertMap.put(key, existCert);
-                }
+        if (!queryKeys.isEmpty()) {
+            List<LedgerCertificateInfo> existingCerts = ledgerCertificateInfoMapper.selectExistingCertificates(queryKeys);
+            for (LedgerCertificateInfo cert : existingCerts) {
+                String mapKey = cert.getUserId() + "_" + cert.getCertLevel();
+                existingCertMap.put(mapKey, cert);
             }
         }
         
-        // 第五步: 处理每个证书的导入（新增或更新）
+        // 第五步: 分类为新增和更新列表，计算到期信息
+        List<LedgerCertificateInfo> toInsert = new ArrayList<>();
+        List<LedgerCertificateInfo> toUpdate = new ArrayList<>();
+        List<Long> affectedUserIds = new ArrayList<>();
+        
         for (LedgerCertificateInfo certificate : certificateList) {
-            try {
-                String key = certificate.getUserId() + "_" + certificate.getCertNo();
-                LedgerCertificateInfo existCert = existingCertMap.get(key);
-                
-                if (existCert != null) {
-                    // 存在则更新
-                    if (isUpdateSupport) {
-                        certificate.setId(existCert.getId());
-                        certificate.setUpdateBy(operName);
-                        ledgerCertificateInfoMapper.updateCertificateInfo(certificate);
-                        
-                        // 更新复审记录
-                        ledgerCertificateReviewRecordMapper.deleteCertificateReviewRecordByCertId(existCert.getId());
-                        saveReviewRecords(existCert.getId(), certificate.getReviewRecords());
-                        
-                        successNum++;
-                        successMsg.append("<br/>").append(successNum).append("、")
-                                .append(certificate.getPersonName()).append(" 的证书编号 ")
-                                .append(certificate.getCertNo()).append(" 更新成功");
-                    } else {
-                        failureNum++;
-                        failureMsg.append("<br/>").append(failureNum).append("、")
-                                .append(certificate.getPersonName()).append(" 的证书编号 ")
-                                .append(certificate.getCertNo()).append(" 已存在");
-                    }
-                } else {
-                    // 不存在则新增
-                    certificate.setCreateBy(operName);
-                    ledgerCertificateInfoMapper.insertCertificateInfo(certificate);
-                    
-                    // 保存复审记录
-                    saveReviewRecords(certificate.getId(), certificate.getReviewRecords());
-                    
-                    successNum++;
-                    successMsg.append("<br/>").append(successNum).append("、")
-                            .append(certificate.getPersonName()).append(" 的证书编号 ")
-                            .append(certificate.getCertNo()).append(" 导入成功");
+            String key = certificate.getUserId() + "_" + certificate.getCertLevel();
+            LedgerCertificateInfo existCert = existingCertMap.get(key);
+            
+            // 计算到期信息
+            calculateExpiryInfo(certificate);
+            
+            if (existCert != null) {
+                certificate.setId(existCert.getId());
+                certificate.setUpdateBy(operName);
+                toUpdate.add(certificate);
+            } else {
+                certificate.setCreateBy(operName);
+                toInsert.add(certificate);
+            }
+            
+            if (!affectedUserIds.contains(certificate.getUserId())) {
+                affectedUserIds.add(certificate.getUserId());
+            }
+        }
+        
+        // 第六步: 批量新增
+        if (!toInsert.isEmpty()) {
+            ledgerCertificateInfoMapper.batchInsertCertificateInfo(toInsert);
+        }
+        
+        // 第七步: 批量更新
+        if (!toUpdate.isEmpty()) {
+            ledgerCertificateInfoMapper.batchUpdateCertificateInfo(toUpdate);
+        }
+        
+        // 第八步: 批量处理复审记录
+        // 批量删除需要更新的证书的复审记录
+        List<Long> updateCertIds = toUpdate.stream()
+                .map(LedgerCertificateInfo::getId)
+                .collect(Collectors.toList());
+        if (!updateCertIds.isEmpty()) {
+            ledgerCertificateReviewRecordMapper.deleteReviewRecordsByCertIds(updateCertIds);
+        }
+        
+        // 批量插入所有复审记录
+        List<LedgerCertificateReviewRecord> allReviewRecords = new ArrayList<>();
+        for (LedgerCertificateInfo cert : toUpdate) {
+            if (cert.getReviewRecords() != null) {
+                for (int i = 0; i < cert.getReviewRecords().size(); i++) {
+                    LedgerCertificateReviewRecord record = cert.getReviewRecords().get(i);
+                    record.setCertId(cert.getId());
+                    record.setReviewSeq(i + 1);
+                    record.setCreateTime(DateUtils.getNowDate());
+                    allReviewRecords.add(record);
+                }
+            }
+        }
+        for (LedgerCertificateInfo cert : toInsert) {
+            if (cert.getReviewRecords() != null) {
+                for (int i = 0; i < cert.getReviewRecords().size(); i++) {
+                    LedgerCertificateReviewRecord record = cert.getReviewRecords().get(i);
+                    record.setCertId(cert.getId());
+                    record.setReviewSeq(i + 1);
+                    record.setCreateTime(DateUtils.getNowDate());
+                    allReviewRecords.add(record);
                 }
-                
-                // 第六步: 同步更新用户表的证书等级（5<4<3<2<1，数字越小等级越高）
-                syncUserQualificationLevel(certificate.getUserId(), certificate.getCertLevel());
-                
-            } catch (Exception e) {
-                failureNum++;
-                String msg = "<br/>" + failureNum + "、" + certificate.getPersonName() + " 的证书编号 " 
-                        + certificate.getCertNo() + " 导入失败：";
-                failureMsg.append(msg + e.getMessage());
             }
         }
+        if (!allReviewRecords.isEmpty()) {
+            ledgerCertificateReviewRecordMapper.batchInsertReviewRecords(allReviewRecords);
+        }
         
-        if (failureNum > 0) {
-            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
-            throw new RuntimeException(failureMsg.toString());
-        } else {
-            successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
+        // 第九步: 刷新所有受影响用户的资质等级
+        for (Long userId : affectedUserIds) {
+            recalculateUserQualification(userId);
         }
+        
+        // 构建返回消息
+        int successNum = toInsert.size() + toUpdate.size();
+        StringBuilder successMsg = new StringBuilder();
+        successMsg.insert(0, "数据已全部导入成功！共 " + successNum + " 条");
         return successMsg.toString();
     }
 
@@ -276,7 +339,7 @@ public class LedgerLedgerCertificateInfoServiceImpl implements ILedgerCertificat
             for (int i = 0; i < reviewRecords.size(); i++) {
                 LedgerCertificateReviewRecord record = reviewRecords.get(i);
                 record.setCertId(certId);
-                record.setReviewSeq(i + 1); // 设置复审次序
+                record.setReviewSeq(i + 1);
                 record.setCreateTime(DateUtils.getNowDate());
                 ledgerCertificateReviewRecordMapper.insertCertificateReviewRecord(record);
             }
@@ -284,46 +347,228 @@ public class LedgerLedgerCertificateInfoServiceImpl implements ILedgerCertificat
     }
 
     /**
-     * 同步更新用户表的证书等级
-     * 等级规则: 5<4<3<2<1 (数字越小等级越高)
-     * 如果出现更高等级，就更新用户表
+     * 计算证书到期信息（到期日期、到期天数、状态）
+     * 到期日期 = 最后复审时间 + 服务期月 - 1天，如果复审时间为空则取发证时间
+     * 到期天数 = 到期日期 - 当前时间
+     * 状态: >180天=正常, >0且<=180=复训, <=0=到期
      * 
-     * @param userId 用户ID
-     * @param newCertLevel 新证书等级
+     * @param certificate 证书信息
      */
-    private void syncUserQualificationLevel(Long userId, String newCertLevel) {
-        if (userId == null || newCertLevel == null || newCertLevel.trim().isEmpty()) {
+    @Override
+    public void calculateExpiryInfo(LedgerCertificateInfo certificate) {
+        if (certificate == null) return;
+        
+        Date baseDate = calculateExpiryBaseDate(certificate);
+        if (baseDate == null || certificate.getServiceMonths() == null) {
             return;
         }
         
+        // 计算到期日期: baseDate + serviceMonths - 1天
+        Date expiryDate = calculateExpiryDate(baseDate, certificate.getServiceMonths());
+        certificate.setExpiryDate(expiryDate);
+        
+        // 计算到期天数
+        int expireDays = calculateExpireDays(expiryDate);
+        certificate.setExpireDays(expireDays);
+        
+        // 计算状态
+        String status = calculateStatus(expireDays);
+        certificate.setStatus(status);
+    }
+
+    /**
+     * 计算到期基准日期：取最后复审时间，如果为空则取发证时间
+     */
+    private Date calculateExpiryBaseDate(LedgerCertificateInfo certificate) {
+        // 优先从传入的复审记录中查找（用于新增/导入场景）
+        List<LedgerCertificateReviewRecord> reviewRecords = certificate.getReviewRecords();
+        
+        // 如果没有传入复审记录，从数据库查询
+        if ((reviewRecords == null || reviewRecords.isEmpty()) && certificate.getId() != null) {
+            reviewRecords = ledgerCertificateReviewRecordMapper.selectCertificateReviewRecordByCertId(certificate.getId());
+        }
+        
+        if (reviewRecords != null && !reviewRecords.isEmpty()) {
+            // 找到最新的复审时间（列表最后一个，按 reviewSeq 升序）
+            LedgerCertificateReviewRecord latestRecord = reviewRecords.get(reviewRecords.size() - 1);
+            if (latestRecord.getReviewTime() != null) {
+                return latestRecord.getReviewTime();
+            }
+        }
+        
+        // 如果没有复审记录或复审时间为空，取发证时间
+        return certificate.getIssueDate();
+    }
+
+    /**
+     * 计算到期日期: baseDate + months 月 - 1天
+     */
+    private Date calculateExpiryDate(Date baseDate, int months) {
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(baseDate);
+        cal.add(Calendar.MONTH, months);
+        cal.add(Calendar.DAY_OF_MONTH, -1);
+        return cal.getTime();
+    }
+
+    /**
+     * 计算到期天数: expiryDate - 当前日期
+     */
+    private int calculateExpireDays(Date expiryDate) {
+        if (expiryDate == null) return 0;
+        Date now = DateUtils.getNowDate();
+        long diff = expiryDate.getTime() - now.getTime();
+        return (int) (diff / (1000 * 60 * 60 * 24));
+    }
+
+    /**
+     * 计算状态: >180天=正常, >0且<=180=复训, <=0=到期
+     */
+    private String calculateStatus(int expireDays) {
+        return CertificateStatusEnum.calculateByExpireDays(expireDays).getDesc();
+    }
+
+    /**
+     * 重新计算用户资质等级
+     * 规则: 查询用户所有证书，找到最高等级（数字最小）且未到期的证书
+     * 如果所有证书都到期，则清空资质
+     * 
+     * @param userId 用户ID
+     */
+    @Override
+    public void recalculateUserQualification(Long userId) {
+        if (userId == null) return;
+        
         try {
-            // 查询用户当前资质等级
-            SysUser user = sysUserService.selectUserById(userId);
-            if (user == null) {
+            // 查询用户所有证书
+            List<LedgerCertificateInfo> allCerts = ledgerCertificateInfoMapper.selectCertificateInfoByUserId(userId);
+            
+            if (allCerts == null || allCerts.isEmpty()) {
+                // 没有证书，清空资质
+                updateUserQualification(userId, null);
                 return;
             }
             
-            String currentLevel = user.getQualificationLevel();
+            // 重新计算每张证书的到期信息
+            for (LedgerCertificateInfo cert : allCerts) {
+                // 对于已有id的证书，查询复审记录来计算到期信息
+                Date baseDate = calculateExpiryBaseDate(cert);
+                if (baseDate != null && cert.getServiceMonths() != null) {
+                    Date expiryDate = calculateExpiryDate(baseDate, cert.getServiceMonths());
+                    cert.setExpiryDate(expiryDate);
+                    int expireDays = calculateExpireDays(expiryDate);
+                    cert.setExpireDays(expireDays);
+                    cert.setStatus(calculateStatus(expireDays));
+                    
+                    // 更新到期信息到数据库
+                    ledgerCertificateInfoMapper.updateCertificateExpiryInfo(cert);
+                }
+            }
+            
+            // 找到最高等级（数字最小）且未到期的证书
+            LedgerCertificateInfo bestValidCert = null;
+            int bestLevel = Integer.MAX_VALUE;
             
-            // 如果用户当前没有等级，直接设置
-            if (currentLevel == null || currentLevel.trim().isEmpty()) {
-                updateUserQualificationLevel(userId, newCertLevel);
+            for (LedgerCertificateInfo cert : allCerts) {
+                // 使用刚计算的状态
+                if (!CertificateStatusEnum.EXPIRED.getDesc().equals(cert.getStatus())) {
+                    int level = parseLevelToNumber(cert.getCertLevel());
+                    if (level < bestLevel) {
+                        bestLevel = level;
+                        bestValidCert = cert;
+                    }
+                }
+            }
+            
+            if (bestValidCert != null) {
+                // 找到未到期证书，设置资质为最高等级
+                String qualificationLevel = convertCertLevelToQualificationFormat(bestValidCert.getCertLevel());
+                updateUserQualification(userId, qualificationLevel);
+            } else {
+                // 所有证书都到期，清空资质
+                updateUserQualification(userId, null);
+            }
+        } catch (Exception e) {
+            log.error("重新计算用户资质等级失败, userId={}", userId, e);
+        }
+    }
+
+    /**
+     * 每日定时更新证书到期信息
+     * 更新所有证书的到期日期、到期天数、状态，并同步用户资质等级
+     */
+    @Override
+    public void dailyUpdateExpiryInfo() {
+        log.info("========== 开始执行证书到期信息每日更新 ==========");
+        
+        try {
+            // 查询所有有效证书
+            List<LedgerCertificateInfo> allCerts = ledgerCertificateInfoMapper.selectAllCertificateInfo();
+            
+            if (allCerts == null || allCerts.isEmpty()) {
+                log.info("没有证书数据需要更新");
                 return;
             }
             
-            // 比较等级高低（数字越小等级越高）
-            int currentLevelNum = parseLevelToNumber(currentLevel);
-            int newLevelNum = parseLevelToNumber(newCertLevel);
+            int updatedCount = 0;
+            List<Long> processedUserIds = new ArrayList<>();
             
-            // 如果新等级更高，则更新用户表
-            if (newLevelNum < currentLevelNum) {
-                updateUserQualificationLevel(userId, newCertLevel);
+            for (LedgerCertificateInfo cert : allCerts) {
+                // 计算到期基准日期
+                Date baseDate = calculateExpiryBaseDate(cert);
+                if (baseDate != null && cert.getServiceMonths() != null) {
+                    Date expiryDate = calculateExpiryDate(baseDate, cert.getServiceMonths());
+                    cert.setExpiryDate(expiryDate);
+                    int expireDays = calculateExpireDays(expiryDate);
+                    cert.setExpireDays(expireDays);
+                    cert.setStatus(calculateStatus(expireDays));
+                    
+                    // 更新到期信息到数据库
+                    ledgerCertificateInfoMapper.updateCertificateExpiryInfo(cert);
+                    updatedCount++;
+                }
+                
+                // 收集用户ID
+                if (cert.getUserId() != null && !processedUserIds.contains(cert.getUserId())) {
+                    processedUserIds.add(cert.getUserId());
+                }
             }
+            
+            log.info("已更新 {} 条证书到期信息", updatedCount);
+            
+            // 统一刷新所有用户的资质等级
+            for (Long userId : processedUserIds) {
+                recalculateUserQualification(userId);
+            }
+            
+            log.info("已刷新 {} 个用户的资质等级", processedUserIds.size());
+            log.info("========== 证书到期信息每日更新完成 ==========");
+            
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("证书到期信息每日更新失败", e);
         }
     }
-    
+
+    /**
+     * 将证书等级格式转换为资质等级格式
+     * 如: "一级" -> "LEVEL_ONE", "2" -> "LEVEL_TWO"
+     */
+    private String convertCertLevelToQualificationFormat(String certLevel) {
+        if (certLevel == null || certLevel.trim().isEmpty()) return null;
+        
+        certLevel = certLevel.trim();
+        
+        if (certLevel.contains("一") || certLevel.equals("1")) return "LEVEL_ONE";
+        if (certLevel.contains("二") || certLevel.equals("2")) return "LEVEL_TWO";
+        if (certLevel.contains("三") || certLevel.equals("3")) return "LEVEL_THREE";
+        if (certLevel.contains("四") || certLevel.equals("4")) return "LEVEL_FOUR";
+        if (certLevel.contains("五") || certLevel.equals("5")) return "LEVEL_FIVE";
+        
+        if (certLevel.toUpperCase().startsWith("LEVEL_")) return certLevel.toUpperCase();
+        
+        return certLevel;
+    }
+
     /**
      * 将等级字符串转换为数字进行比较
      * 支持格式: "一级"、"LEVEL_ONE"、"1" 等
@@ -367,14 +612,14 @@ public class LedgerLedgerCertificateInfoServiceImpl implements ILedgerCertificat
      * @param userId 用户ID
      * @param qualificationLevel 资质等级
      */
-    private void updateUserQualificationLevel(Long userId, String qualificationLevel) {
+    private void updateUserQualification(Long userId, String qualificationLevel) {
         try {
             SysUser user = new SysUser();
             user.setUserId(userId);
             user.setQualificationLevel(qualificationLevel);
             sysUserService.updateUserProfile(user);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("更新用户资质等级失败, userId={}, level={}", userId, qualificationLevel, e);
         }
     }
 }

airport-ledger/src/main/resources/mapper/personnel/LedgerCertificateInfoMapper.xml

@@ -94,6 +94,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectCertificateInfoVo"/>
         where user_id = #{userId} and cert_no = #{certNo} and del_flag = '0' limit 1
     </select>
+
+    <select id="selectCertificateInfoByUserIdAndCertLevel" resultMap="CertificateInfoResult">
+        <include refid="selectCertificateInfoVo"/>
+        where user_id = #{userId} and cert_level = #{certLevel} and del_flag = '0' limit 1
+    </select>
+
+    <select id="selectCertificateInfoByUserId" resultMap="CertificateInfoResult">
+        <include refid="selectCertificateInfoVo"/>
+        where user_id = #{userId} and del_flag = '0'
+        order by cert_level asc
+    </select>
+
+    <select id="selectAllCertificateInfo" resultMap="CertificateInfoResult">
+        <include refid="selectCertificateInfoVo"/>
+        where del_flag = '0'
+    </select>
+
+    <update id="updateCertificateExpiryInfo" parameterType="LedgerCertificateInfo">
+        update ledger_certificate_info
+        set expiry_date = #{expiryDate},
+            expire_days = #{expireDays},
+            status = #{status},
+            update_time = sysdate()
+        where id = #{id}
+    </update>
         
     <insert id="insertCertificateInfo" parameterType="LedgerCertificateInfo" useGeneratedKeys="true" keyProperty="id">
         insert into ledger_certificate_info
@@ -185,4 +210,58 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectExistingCertificates" resultMap="CertificateInfoResult">
+        <include refid="selectCertificateInfoVo"/>
+        where del_flag = '0' and (
+        <foreach collection="list" item="item" separator=" OR ">
+            (user_id = #{item.userId} AND cert_level = #{item.certLevel})
+        </foreach>
+        )
+    </select>
+
+    <insert id="batchInsertCertificateInfo" useGeneratedKeys="true" keyProperty="list.id">
+        insert into ledger_certificate_info
+        (tenant_id, unit_name, user_id, person_name, gender, birth_date, id_card,
+         cert_level, issue_date, cert_no, theory_score, practice_score, eval_score,
+         employment_type, service_months, expiry_date, status, expire_days, remark,
+         create_by, create_time, del_flag)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.tenantId}, #{item.unitName}, #{item.userId}, #{item.personName},
+             #{item.gender}, #{item.birthDate}, #{item.idCard}, #{item.certLevel},
+             #{item.issueDate}, #{item.certNo}, #{item.theoryScore}, #{item.practiceScore},
+             #{item.evalScore}, #{item.employmentType}, #{item.serviceMonths},
+             #{item.expiryDate}, #{item.status}, #{item.expireDays}, #{item.remark},
+             #{item.createBy}, sysdate(), '0')
+        </foreach>
+    </insert>
+
+    <update id="batchUpdateCertificateInfo">
+        <foreach collection="list" item="item" separator=";">
+            update ledger_certificate_info
+            set tenant_id = #{item.tenantId},
+                unit_name = #{item.unitName},
+                user_id = #{item.userId},
+                person_name = #{item.personName},
+                gender = #{item.gender},
+                birth_date = #{item.birthDate},
+                id_card = #{item.idCard},
+                cert_level = #{item.certLevel},
+                issue_date = #{item.issueDate},
+                cert_no = #{item.certNo},
+                theory_score = #{item.theoryScore},
+                practice_score = #{item.practiceScore},
+                eval_score = #{item.evalScore},
+                employment_type = #{item.employmentType},
+                service_months = #{item.serviceMonths},
+                expiry_date = #{item.expiryDate},
+                status = #{item.status},
+                expire_days = #{item.expireDays},
+                remark = #{item.remark},
+                update_by = #{item.updateBy},
+                update_time = sysdate()
+            where id = #{item.id}
+        </foreach>
+    </update>
 </mapper>

airport-ledger/src/main/resources/mapper/personnel/LedgerCertificateReviewRecordMapper.xml

@@ -20,7 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectCertificateReviewRecordVo">
         select id, cert_id, review_seq, review_time,  remark,
                create_by, create_time, update_by, update_time, del_flag
-        from certificate_review_record
+        from ledger_certificate_review_record
     </sql>
 
     <select id="selectCertificateReviewRecordList" parameterType="LedgerCertificateReviewRecord" resultMap="CertificateReviewRecordResult">
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
         
     <insert id="insertCertificateReviewRecord" parameterType="LedgerCertificateReviewRecord" useGeneratedKeys="true" keyProperty="id">
-        insert into certificate_review_record
+        insert into ledger_certificate_review_record
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="certId != null">cert_id,</if>
             <if test="reviewSeq != null">review_seq,</if>
@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateCertificateReviewRecord" parameterType="LedgerCertificateReviewRecord">
-        update certificate_review_record
+        update ledger_certificate_review_record
         <trim prefix="SET" suffixOverrides=",">
             <if test="certId != null">cert_id = #{certId},</if>
             <if test="reviewSeq != null">review_seq = #{reviewSeq},</if>
@@ -86,17 +86,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteCertificateReviewRecordById" parameterType="Long">
-        update certificate_review_record set del_flag = '2' where id = #{id}
+        update ledger_certificate_review_record set del_flag = '2' where id = #{id}
     </delete>
 
     <delete id="deleteCertificateReviewRecordByIds" parameterType="Long">
-        update certificate_review_record set del_flag = '2' where id in
+        update ledger_certificate_review_record set del_flag = '2' where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
 
     <delete id="deleteCertificateReviewRecordByCertId" parameterType="Long">
-        update certificate_review_record set del_flag = '2' where cert_id = #{certId}
+        update ledger_certificate_review_record set del_flag = '2' where cert_id = #{certId}
     </delete>
+
+    <delete id="deleteReviewRecordsByCertIds">
+        update ledger_certificate_review_record set del_flag = '2' where cert_id in
+        <foreach collection="certIds" item="certId" open="(" separator="," close=")">
+            #{certId}
+        </foreach>
+    </delete>
+
+    <insert id="batchInsertReviewRecords">
+        insert into ledger_certificate_review_record
+        (cert_id, review_seq, review_time, remark, create_by, create_time, del_flag)
+        values
+        <foreach collection="list" item="item" separator=",">
+            (#{item.certId}, #{item.reviewSeq}, #{item.reviewTime}, #{item.remark},
+             #{item.createBy}, sysdate(), '0')
+        </foreach>
+    </insert>
 </mapper>

airport-quartz/pom.xml

@@ -42,6 +42,10 @@
             <groupId>com.sundot.airport</groupId>
             <artifactId>airport-exam</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.sundot.airport</groupId>
+            <artifactId>airport-ledger</artifactId>
+        </dependency>
 
     </dependencies>
 

airport-quartz/src/main/java/com/sundot/airport/quartz/task/CertificateExpiryTask.java

@@ -0,0 +1,55 @@
+package com.sundot.airport.quartz.task;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import com.sundot.airport.ledger.service.ILedgerCertificateInfoService;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 证书到期信息每日更新定时任务
+ * 
+ * <p>
+ * 定时任务配置说明：
+ * - 执行时间：每天凌晨2:00执行
+ * - Cron表达式：0 0 2 * * ?
+ * - 调用目标：certificateExpiryTask.updateExpiryInfo
+ * </p>
+ * 
+ * @author ruoyi
+ */
+@Component("certificateExpiryTask")
+public class CertificateExpiryTask {
+
+    private static final Logger log = LoggerFactory.getLogger(CertificateExpiryTask.class);
+
+    @Autowired
+    private ILedgerCertificateInfoService certificateInfoService;
+
+    /**
+     * 每日更新证书到期信息
+     * <p>
+     * 更新所有证书的到期日期、到期天数、状态，并同步更新用户资质等级
+     * </p>
+     */
+    public void updateExpiryInfo() {
+        try {
+            log.info("========== 开始执行证书到期信息每日更新任务 ==========");
+            
+            certificateInfoService.dailyUpdateExpiryInfo();
+            
+            log.info("========== 证书到期信息每日更新任务执行完成 ==========");
+        } catch (Exception e) {
+            log.error("执行证书到期信息每日更新任务失败", e);
+        }
+    }
+
+    /**
+     * 手动触发证书到期信息更新（用于测试）
+     */
+    public void updateExpiryInfoManual() {
+        log.info("手动触发证书到期信息更新");
+        updateExpiryInfo();
+    }
+}