资质汇总表--字段改动

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

@@ -36,12 +36,6 @@ public class LedgerCertificateInfo extends BaseEntity {
     private String tenantId;
 
     /**
-     * 单位
-     */
-    @Excel(name = "单位")
-    private String unitName;
-
-    /**
      * 用户ID(关联sys_user表)
      */
     @TableField("user_id")
@@ -53,24 +47,6 @@ public class LedgerCertificateInfo extends BaseEntity {
     @Excel(name = "姓名")
     private String personName;
 
-    /**
-     * 性别
-     */
-    @Excel(name = "性别", readConverterExp = "男=男,女=女")
-    private String gender;
-
-    /**
-     * 出生日期
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date birthDate;
-
-    /**
-     * 身份证号
-     */
-    @Excel(name = "身份证号")
-    private String idCard;
 
     /**
      * 证书等级
@@ -110,12 +86,6 @@ public class LedgerCertificateInfo extends BaseEntity {
     private String evalScore;
 
     /**
-     * 用工形式
-     */
-    @Excel(name = "用工形式")
-    private String employmentType;
-
-    /**
      * 服务期(月)
      */
     @Excel(name = "服务期（月）")
@@ -170,14 +140,6 @@ public class LedgerCertificateInfo extends BaseEntity {
         return tenantId;
     }
 
-    public void setUnitName(String unitName) {
-        this.unitName = unitName;
-    }
-
-    public String getUnitName() {
-        return unitName;
-    }
-
     public void setUserId(Long userId) {
         this.userId = userId;
     }
@@ -194,30 +156,6 @@ public class LedgerCertificateInfo extends BaseEntity {
         return personName;
     }
 
-    public void setGender(String gender) {
-        this.gender = gender;
-    }
-
-    public String getGender() {
-        return gender;
-    }
-
-    public void setBirthDate(Date birthDate) {
-        this.birthDate = birthDate;
-    }
-
-    public Date getBirthDate() {
-        return birthDate;
-    }
-
-    public void setIdCard(String idCard) {
-        this.idCard = idCard;
-    }
-
-    public String getIdCard() {
-        return idCard;
-    }
-
     public void setCertLevel(String certLevel) {
         this.certLevel = certLevel;
     }
@@ -266,13 +204,6 @@ public class LedgerCertificateInfo extends BaseEntity {
         return evalScore;
     }
 
-    public void setEmploymentType(String employmentType) {
-        this.employmentType = employmentType;
-    }
-
-    public String getEmploymentType() {
-        return employmentType;
-    }
 
     public void setServiceMonths(Integer serviceMonths) {
         this.serviceMonths = serviceMonths;
@@ -335,19 +266,14 @@ public class LedgerCertificateInfo extends BaseEntity {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                 .append("id", getId())
                 .append("tenantId", getTenantId())
-                .append("unitName", getUnitName())
                 .append("userId", getUserId())
                 .append("personName", getPersonName())
-                .append("gender", getGender())
-                .append("birthDate", getBirthDate())
-                .append("idCard", getIdCard())
                 .append("certLevel", getCertLevel())
                 .append("issueDate", getIssueDate())
                 .append("certNo", getCertNo())
                 .append("theoryScore", getTheoryScore())
                 .append("practiceScore", getPracticeScore())
                 .append("evalScore", getEvalScore())
-                .append("employmentType", getEmploymentType())
                 .append("serviceMonths", getServiceMonths())
                 .append("expiryDate", getExpiryDate())
                 .append("status", getStatus())

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

@@ -1,5 +1,6 @@
 package com.sundot.airport.ledger.dto;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 import com.sundot.airport.common.annotation.Excel;
@@ -14,18 +15,6 @@ 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;
 
@@ -36,17 +25,14 @@ public class LedgerCertificateImportTemplate {
     private String certNo;
 
     @Excel(name = "理论考核成绩")
-    private Double theoryScore;
+    private BigDecimal theoryScore;
 
     @Excel(name = "实操考核成绩")
-    private Double practiceScore;
+    private BigDecimal practiceScore;
 
     @Excel(name = "评定成绩")
     private String evalScore;
 
-    @Excel(name = "用工形式")
-    private String employmentType;
-
     @Excel(name = "服务期（月）")
     private Integer serviceMonths;
 
@@ -71,22 +57,9 @@ public class LedgerCertificateImportTemplate {
     @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; }
 
@@ -96,18 +69,15 @@ public class LedgerCertificateImportTemplate {
     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 BigDecimal getTheoryScore() { return theoryScore; }
+    public void setTheoryScore(BigDecimal theoryScore) { this.theoryScore = theoryScore; }
 
-    public Double getPracticeScore() { return practiceScore; }
-    public void setPracticeScore(Double practiceScore) { this.practiceScore = practiceScore; }
+    public BigDecimal getPracticeScore() { return practiceScore; }
+    public void setPracticeScore(BigDecimal 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; }
 

airport-ledger/src/main/java/com/sundot/airport/ledger/utils/CertificateExcelExportUtil.java

@@ -25,9 +25,8 @@ public class CertificateExcelExportUtil {
 
     /** 标准列头定义（与@Excel注解顺序一致） */
     private static final String[] STANDARD_HEADERS = {
-            "单位", "姓名", "性别", "出生日期", "身份证号",
-            "证书等级", "发证日期", "证书编号", "理论考核成绩", "实操考核成绩",
-            "评定成绩", "用工形式", "服务期（月）", "备注"
+            "姓名", "证书等级", "发证日期", "证书编号", "理论考核成绩",
+            "实操考核成绩", "评定成绩",  "服务期（月）", "备注"
     };
 
     /** 标准列宽度 */
@@ -92,18 +91,13 @@ public class CertificateExcelExportUtil {
                 int col = 0;
 
                 // 标准字段
-                setCellValue(dataRow, col++, cert.getUnitName(), dataStyle);
                 setCellValue(dataRow, col++, cert.getPersonName(), dataStyle);
-                setCellValue(dataRow, col++, cert.getGender(), dataStyle);
-                setDateCellValue(dataRow, col++, cert.getBirthDate(), sdf, dateStyle);
-                setCellValue(dataRow, col++, cert.getIdCard(), dataStyle);
                 setCellValue(dataRow, col++, cert.getCertLevel(), dataStyle);
                 setDateCellValue(dataRow, col++, cert.getIssueDate(), sdf, dateStyle);
                 setCellValue(dataRow, col++, cert.getCertNo(), dataStyle);
                 setBigDecimalCellValue(dataRow, col++, cert.getTheoryScore(), dataStyle);
                 setBigDecimalCellValue(dataRow, col++, cert.getPracticeScore(), dataStyle);
                 setCellValue(dataRow, col++, cert.getEvalScore(), dataStyle);
-                setCellValue(dataRow, col++, cert.getEmploymentType(), dataStyle);
                 setCellValue(dataRow, col++, cert.getServiceMonths() != null ? String.valueOf(cert.getServiceMonths()) : null, dataStyle);
                 setCellValue(dataRow, col++, cert.getRemark(), dataStyle);