-修改BYX上岗证、作业证

master/src/main/java/com/ruoyi/project/training/controller/TByxWorkcertificateController.java

@@ -161,6 +161,7 @@ public class TByxWorkcertificateController extends BaseController
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TByxWorkcertificate> list = new ArrayList<>();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         //字典查询
         List<SysDictData> plant = iSysDictTypeService.selectDictDataByType("PLANT_DIVIDE");
         List<SysDictData> classes = iSysDictTypeService.selectDictDataByType("CLASSES");
@@ -207,42 +208,45 @@ public class TByxWorkcertificateController extends BaseController
                     } else if (j == 4) {
                         entity.setContainer(cellValue);//移动式压力容器充装
                     } else if (j == 5) {
-                        entity.setFireFacilities(cellValue);//消防设施操作
+                        entity.setContainerIdnum(cellValue);//移动式压力容器充装证件号
                     } else if (j == 6) {
-                        entity.setIdnum(cellValue);//身份证件号
+                        if (cellValue.length() > 3)
+                            entity.setContainerDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//移动式压力容器充装证件有效期
                     } else if (j == 7) {
-                        if (cellValue.length() > 3) {
-                            entity.setReviewdate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//复证日期
-                        }
+                        entity.setFireFacilities(cellValue);//消防设施操作
                     } else if (j == 8) {
+                        entity.setFireFacilitiesIdnum(cellValue);//消防设施操作证件号
+                    } else if (j == 9) {
                         if (cellValue.length() > 3) {
-                            entity.setPipevalidity(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//有效期
+                            entity.setFireFacilitiesDate(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//消防设施操作证件有效期
                         }
-                    } else if (j == 9) {
-                        entity.setGuardian(cellValue);//监护人专项培训
                     } else if (j == 10) {
+                        entity.setGuardian(cellValue);//监护人专项培训
+                    } else if (j == 11) {
+                        entity.setGuardianIdnum(cellValue);//监护人专项培训证件号
+                    } else if (j == 12) {
                         if (cellValue.length() > 3) {
                             entity.setBoilvalidity(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//有效期
                         }
-                    } else if (j == 11) {
+                    } else if (j == 13) {
                         if (cellValue.length() > 3) {
                             entity.setForemantrain(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//班组长最近培训日期
                         }
-                    } else if (j == 12) {
+                    } else if (j == 14) {
                         if (cellValue.length() > 3) {
                             entity.setForemanreview(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//班组长本次复审
                         }
-                    } else if (j == 13) {
+                    } else if (j == 15) {
                         if (cellValue.length() > 3) {
                             entity.setForemannextreview(new SimpleDateFormat(DateUtils.getDateFormat(cellValue)).parse(cellValue));//班组长下次复审
                         }
-                    } else if (j == 14) {
+                    } else if (j == 16) {
                         for (SysDept d : dept) {
                             if (d.getDeptName().equals(cellValue.trim())) {
                                 entity.setDeptId(d.getDeptId());//部门编号
                             }
                         }
-                    } else if (j == 15) {
+                    } else if (j == 17) {
                         entity.setRemarks(cellValue);//备注
                     }
                 }

master/src/main/java/com/ruoyi/project/training/domain/TByxWorkcertificate.java

@@ -34,45 +34,55 @@ public class TByxWorkcertificate extends BaseEntity
     private String employeeid;
 
     /** 班组 */
-    @Excel(name = "班型", dictType = "CLASSES")
+    @Excel(name = "班组", dictType = "CLASSES")
     private String classes;
 
-    /** 压力容器 */
+    /** 移动式压力容器充装 */
     @Excel(name = "移动式压力容器充装")
     private String container;
+
+    @Excel(name = "证件号")
     private String containerIdnum;
+
+    @Excel(name = "证件有效期", width = 30, dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date containerDate;
 
-    /** 压力管道 */
+    /** 消防设施操作 */
     @Excel(name = "消防设施操作")
     private String fireFacilities;
+
+    @Excel(name = "证件号")
     private String fireFacilitiesIdnum;
+
+    @Excel(name = "证件有效期", width = 30, dateFormat = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
     private Date fireFacilitiesDate;
 
     /** 身份证件号 */
-    @Excel(name = "身份证件号")
+//    @Excel(name = "身份证件号")
     private String idnum;
 
     /** 复证日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "复证日期", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "复证日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date reviewdate;
 
     /** 有效期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date pipevalidity;
 
-    /** 锅炉证 */
+    /** 监护人专项培训 */
     @Excel(name = "监护人专项培训")
     private String guardian;
+
+    @Excel(name = "证件号")
     private String guardianIdnum;
 
     /** 有效期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "证件有效期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date boilvalidity;
 
     /** 班组长最近培训日期 */

master/src/main/java/com/ruoyi/project/training/domain/TByxWorklicense.java

@@ -42,7 +42,7 @@ public class TByxWorklicense extends BaseEntity
     private String post;
 
     /** 证件类型 */
-    @Excel(name = "证件类型")
+//    @Excel(name = "证件类型")
     private String idtype;
 
     /** 裂解证件号 */
@@ -61,63 +61,65 @@ public class TByxWorklicense extends BaseEntity
     //@Excel(name = "PGU/AEU证件号")
     private String alkylationIdnum;
 
-    /** 分离取证日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    //@Excel(name = "取复证日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date pipeDate;
-
-    /** 压缩取证日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    //@Excel(name = "取复证日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date containerDate;
-
-    /** PGU/AEU取证日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    //@Excel(name = "取复证日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date alkylationDate;
+    /** 裂解 */
+    @Excel(name = "裂解（裂化）", dictType = "YES_NO_EN")
+    private String boiler;
 
     /** 裂解取证日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-   // @Excel(name = "取复证日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "取复证日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date boilerDate;
 
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    //@Excel(name = "证件有效期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date pipeLifespan;
-
-    /** 压缩取证日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    //@Excel(name = "证件有效期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date containerLifespan;
-
-    /** PGU/AEU取证日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    //@Excel(name = "证件有效期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date alkylationLifespan;
-
     /** 裂解取证日期 */
     @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
-    // @Excel(name = "证件有效期", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "证件有效期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date boilerLifespan;
 
-    /** 裂解 */
-    @Excel(name = "裂解（裂化）", dictType = "YES_NO_EN")
-    private String boiler;
-
     /** 压缩 */
     @Excel(name = "压力容器", dictType = "YES_NO_EN")
     private String container;
 
+    /** 压缩取证日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "取复证日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date containerDate;
+
+
+    /** 压缩取证日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "证件有效期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date containerLifespan;
+
     /** 分离 */
     @Excel(name = "压力管道", dictType = "YES_NO_EN")
     private String pipe;
 
+    /** 分离取证日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "取复证日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date pipeDate;
+
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "证件有效期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date pipeLifespan;
+
     /** PGU */
     @Excel(name = "烷基化", dictType = "YES_NO_EN")
     private String alkylation;
 
+
+    /** PGU/AEU取证日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "取复证日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date alkylationDate;
+
+    /** PGU/AEU取证日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "证件有效期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date alkylationLifespan;
+
     /** AEU */
-    @Excel(name = "AEU", dictType = "YES_NO_EN")
+//    @Excel(name = "AEU", dictType = "YES_NO_EN")
     private String aromatic;
 
     /** 取复证日期 */