特种设备报告 明细

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevCcController.java

@@ -309,6 +309,8 @@ public class TSpecdevCcController extends BaseController {
                         entity.setAssetOwner(cellValue);//资产形式
                     } else if (j == 27) {
                         entity.setRemarks(cellValue);//备注
+                    }else if (j == 28) {
+                        entity.setRemarks2(cellValue);//备注2
                     }
                 }
                 entity.setCreaterCode(userId);
@@ -445,6 +447,8 @@ public class TSpecdevCcController extends BaseController {
                         entity.setPerTestConclusion(cellValue);
                     }else if (j == 8) {
                         entity.setRemarks(cellValue);
+                    }else if (j == 9) {
+                        entity.setRemarks2(cellValue);
                     }
                 }
                 logger.info("entity:" + entity);
@@ -538,6 +542,7 @@ public class TSpecdevCcController extends BaseController {
         sheet.setColumnWidth(6, 26 * 256);
         sheet.setColumnWidth(7, 26 * 256);
         sheet.setColumnWidth(8, 40 * 256);
+        sheet.setColumnWidth(9, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -565,6 +570,8 @@ public class TSpecdevCcController extends BaseController {
         row0.getCell(7).setCellStyle(style);
         row0.createCell(8).setCellValue("备注");
         row0.getCell(8).setCellStyle(style);
+        row0.createCell(9).setCellValue("备注2");
+        row0.getCell(9).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -584,6 +591,7 @@ public class TSpecdevCcController extends BaseController {
             row.createCell(6).setCellValue(t.getReportNo());
             row.createCell(7).setCellValue(t.getPerTestConclusion());
             row.createCell(8).setCellValue(t.getRemarks());
+            row.createCell(9).setCellValue(t.getRemarks2());
             rowIndex++;
         }
 

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDtController.java

@@ -287,6 +287,8 @@ public class TSpecdevDtController extends BaseController {
                         entity.setPerTestConclusion(cellValue);//备注
                     } else if (j == 19) {
                         entity.setRemarks(cellValue);//备注
+                    }else if (j == 20) {
+                        entity.setRemarks2(cellValue);//备注2
                     }/*else if (j == 17) {
                         for (SysDept d : dept) {
                             if (d.getDeptName().equals(cellValue)) {
@@ -432,8 +434,10 @@ public class TSpecdevDtController extends BaseController {
                         }
                     } else if (j == 9) {    //定期结论
                         entity.setPerTestConclusion(cellValue);
-                    }else if (j == 10) {    //定期结论
+                    }else if (j == 10) {    //备注
                         entity.setRemarks(cellValue);
+                    }else if (j == 11) {    //备注2
+                        entity.setRemarks2(cellValue);
                     }
                 }
                 logger.info("entity:" + JSON.toJSONString(entity));
@@ -527,6 +531,7 @@ public class TSpecdevDtController extends BaseController {
         sheet.setColumnWidth(7, 26 * 256);
         sheet.setColumnWidth(8, 40 * 256);
         sheet.setColumnWidth(9, 40 * 256);
+        sheet.setColumnWidth(10, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -557,6 +562,8 @@ public class TSpecdevDtController extends BaseController {
         row0.getCell(9).setCellStyle(style);
         row0.createCell(10).setCellValue("备注");
         row0.getCell(10).setCellStyle(style);
+        row0.createCell(11).setCellValue("备注2");
+        row0.getCell(11).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -578,6 +585,7 @@ public class TSpecdevDtController extends BaseController {
             }
             row.createCell(9).setCellValue(t.getPerTestConclusion());
             row.createCell(10).setCellValue(t.getRemarks());
+            row.createCell(11).setCellValue(t.getRemarks2());
             rowIndex++;
         }
 

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevDzsbController.java

@@ -298,6 +298,8 @@ public class TSpecdevDzsbController extends BaseController {
                         entity.setPerTestConclusion(cellValue);
                     } else if (j == 23) {
                         entity.setRemarks(cellValue);//备注
+                    }else if (j == 24) {
+                        entity.setRemarks2(cellValue);//备注2
                     }/*else if (j == 20) {
                         for (SysDept d : dept) {
                             if (d.getDeptName().equals(cellValue)) {
@@ -445,6 +447,8 @@ public class TSpecdevDzsbController extends BaseController {
                     entity.setPerTestConclusion(cellValue);
                 }else if (j == 10) {    //
                     entity.setRemarks(cellValue);
+                }else if (j == 11) {    //
+                    entity.setRemarks2(cellValue);
                 }
             }
             logger.info("entity:" + JSON.toJSONString(entity));
@@ -537,6 +541,7 @@ public class TSpecdevDzsbController extends BaseController {
         sheet.setColumnWidth(7, 26 * 256);
         sheet.setColumnWidth(8, 40 * 256);
         sheet.setColumnWidth(9, 40 * 256);
+        sheet.setColumnWidth(10, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -567,6 +572,8 @@ public class TSpecdevDzsbController extends BaseController {
         row0.getCell(9).setCellStyle(style);
         row0.createCell(10).setCellValue("备注");
         row0.getCell(10).setCellStyle(style);
+        row0.createCell(11).setCellValue("备注2");
+        row0.getCell(11).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -588,6 +595,7 @@ public class TSpecdevDzsbController extends BaseController {
             }
             row.createCell(9).setCellValue(t.getPerTestConclusion());
             row.createCell(10).setCellValue(t.getRemarks());
+            row.createCell(11).setCellValue(t.getRemarks2());
             rowIndex++;
         }
         OutputStream out = null;

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevGlController.java

@@ -322,13 +322,9 @@ public class TSpecdevGlController extends BaseController
                         }
                     } else if (j == 29) {
                         entity.setRemarks(cellValue);//备注
-                    }/*else if (j == 30) {
-                        for (SysDept d : dept) {
-                            if (d.getDeptName().equals(cellValue)) {
-                                entity.setDeptId(d.getDeptId());//部门编号
-                            }
-                        }
-                    }*/
+                    }else if (j == 30) {
+                        entity.setRemarks2(cellValue);//备注2
+                    }
 
                 }
                 entity.setCreaterCode(userId.toString());
@@ -486,6 +482,8 @@ public class TSpecdevGlController extends BaseController
                         }
                     }else if (j == 14) {
                         entity.setRemarks(cellValue);//beizhu
+                    }else if (j == 15) {
+                        entity.setRemarks2(cellValue);//beizhu
                     }
                 }
                 logger.info("entity:" + JSON.toJSONString(entity));
@@ -588,6 +586,7 @@ public class TSpecdevGlController extends BaseController
         sheet.setColumnWidth(11, 26*256);
         sheet.setColumnWidth(12, 40*256);
         sheet.setColumnWidth(13, 40*256);
+        sheet.setColumnWidth(13, 40*256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -617,6 +616,8 @@ public class TSpecdevGlController extends BaseController
         row0.createCell(12).setCellValue("外部检验报告编号");row0.getCell(12).setCellStyle(style);
         row0.createCell(13).setCellValue("下次外部检验日期");row0.getCell(13).setCellStyle(style);
         row0.createCell(14).setCellValue("备注");row0.getCell(14).setCellStyle(style);
+        row0.createCell(15).setCellValue("备注2");row0.getCell(15).setCellStyle(style);
+
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -647,6 +648,7 @@ public class TSpecdevGlController extends BaseController
                 row.createCell(13).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getOutNextWarnDate()));
             }
             row.createCell(14).setCellValue(t.getRemarks());
+            row.createCell(15).setCellValue(t.getRemarks2());
             rowIndex++;
         }
         OutputStream out = null;

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlgdController.java

@@ -349,6 +349,8 @@ public class TSpecdevYlgdController extends BaseController {
                         entity.setYearReportNo(cellValue);
                     } else if (j == 38) {
                         entity.setRemarks(cellValue);//备注
+                    }else if (j == 39) {
+                        entity.setRemarks2(cellValue);//备注2
                     } /*else if (j == 39) {
                         for (SysDept d : dept) {
                             if (d.getDeptName().equals(cellValue)) {
@@ -523,6 +525,8 @@ public class TSpecdevYlgdController extends BaseController {
                         entity.setYearReportNo(cellValue);
                     }else if (j == 14) {   //备注
                         entity.setRemarks(cellValue);
+                    }else if (j == 15) {   //备注2
+                        entity.setRemarks2(cellValue);
                     }
                 }
                 logger.info("entity:" + JSON.toJSONString(entity));
@@ -646,6 +650,7 @@ public class TSpecdevYlgdController extends BaseController {
         sheet.setColumnWidth(11, 26 * 256);
         sheet.setColumnWidth(12, 40 * 256);
         sheet.setColumnWidth(13, 40 * 256);
+        sheet.setColumnWidth(14, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -685,6 +690,8 @@ public class TSpecdevYlgdController extends BaseController {
         row0.getCell(13).setCellStyle(style);
         row0.createCell(14).setCellValue("备注");
         row0.getCell(14).setCellStyle(style);
+        row0.createCell(15).setCellValue("备注2");
+        row0.getCell(15).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -714,6 +721,7 @@ public class TSpecdevYlgdController extends BaseController {
             }
             row.createCell(13).setCellValue(t.getYearReportNo());
             row.createCell(14).setCellValue(t.getRemarks());
+            row.createCell(15).setCellValue(t.getRemarks2());
             rowIndex++;
         }
         OutputStream out = null;

master/src/main/java/com/ruoyi/project/sems/controller/TSpecdevYlrqController.java

@@ -368,6 +368,8 @@ public class TSpecdevYlrqController extends BaseController {
                         entity.setYearReportNo(cellValue);//报告编号
                     } else if (j == 33) {
                         entity.setRemarks(cellValue);//备注
+                    } else if (j == 34) {
+                        entity.setRemarks(cellValue);//备注2
                     }/*else if (j == 33) {
                         for (SysDept d : dept) {
                             if (d.getDeptName().equals(cellValue)) {
@@ -535,6 +537,8 @@ public class TSpecdevYlrqController extends BaseController {
                         entity.setYearReportNo(cellValue);
                     }else if (j == 14) {//备注
                         entity.setRemarks(cellValue);
+                    }else if (j == 15) {//备注
+                        entity.setRemarks2(cellValue);
                     }
                 }
                 logger.info("entity:" + entity);
@@ -656,6 +660,7 @@ public class TSpecdevYlrqController extends BaseController {
         sheet.setColumnWidth(11, 26 * 256);
         sheet.setColumnWidth(12, 40 * 256);
         sheet.setColumnWidth(13, 40 * 256);
+        sheet.setColumnWidth(14, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -695,6 +700,8 @@ public class TSpecdevYlrqController extends BaseController {
         row0.getCell(13).setCellStyle(style);
         row0.createCell(14).setCellValue("备注");
         row0.getCell(14).setCellStyle(style);
+        row0.createCell(15).setCellValue("备注2");
+        row0.getCell(15).setCellStyle(style);
 
         //填充数据
         int rowIndex = 1;
@@ -725,6 +732,7 @@ public class TSpecdevYlrqController extends BaseController {
             }
             row.createCell(13).setCellValue(t.getYearReportNo());
             row.createCell(14).setCellValue(t.getRemarks());
+            row.createCell(15).setCellValue(t.getRemarks2());
             rowIndex++;
         }
         OutputStream out = null;

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevCc.java

@@ -141,6 +141,10 @@ public class TSpecdevCc extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 备注 */
+    @Excel(name = "备注2")
+    private String remarks2;
+
     /** 设备位号 */
     //@Excel(name = "设备位号")
     private String devno;
@@ -698,6 +702,14 @@ public class TSpecdevCc extends BaseEntity
         this.wxjl = wxjl;
     }
 
+    public String getRemarks2() {
+        return remarks2;
+    }
+
+    public void setRemarks2(String remarks2) {
+        this.remarks2 = remarks2;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevDt.java

@@ -115,6 +115,10 @@ public class TSpecdevDt extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 备注 */
+    @Excel(name = "备注2")
+    private String remarks2;
+
     /** 设备位号 */
     //@Excel(name = "设备位号")
     private String devno;
@@ -612,6 +616,14 @@ public class TSpecdevDt extends BaseEntity
         this.plantMaint = plantMaint;
     }
 
+    public String getRemarks2() {
+        return remarks2;
+    }
+
+    public void setRemarks2(String remarks2) {
+        this.remarks2 = remarks2;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevDzsb.java

@@ -127,6 +127,10 @@ public class TSpecdevDzsb extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 备注 */
+    @Excel(name = "备注2")
+    private String remarks2;
+
     /** 状态 1 ：正常 ；0：删除 */
     private Long delFlag;
 
@@ -613,6 +617,14 @@ public class TSpecdevDzsb extends BaseEntity
         this.devCode = devCode;
     }
 
+    public String getRemarks2() {
+        return remarks2;
+    }
+
+    public void setRemarks2(String remarks2) {
+        this.remarks2 = remarks2;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevGl.java

@@ -151,6 +151,10 @@ public class TSpecdevGl extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 备注 */
+    @Excel(name = "备注2")
+    private String remarks2;
+
     /** 状态 1 ：正常 ；0：删除 */
     private Long delFlag;
 
@@ -668,6 +672,14 @@ public class TSpecdevGl extends BaseEntity
         this.checkYear = checkYear;
     }
 
+    public String getRemarks2() {
+        return remarks2;
+    }
+
+    public void setRemarks2(String remarks2) {
+        this.remarks2 = remarks2;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevYlgd.java

@@ -199,6 +199,10 @@ public class TSpecdevYlgd extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 备注 */
+    @Excel(name = "备注2")
+    private String remarks2;
+
     /** 状态 1 ：正常 ；0：删除 */
     private Long delFlag;
 
@@ -740,6 +744,14 @@ public class TSpecdevYlgd extends BaseEntity
         this.engineer = engineer;
     }
 
+    public String getRemarks2() {
+        return remarks2;
+    }
+
+    public void setRemarks2(String remarks2) {
+        this.remarks2 = remarks2;
+    }
+
     public String getEngineer()
     {
         return engineer;

master/src/main/java/com/ruoyi/project/sems/domain/TSpecdevYlrq.java

@@ -169,6 +169,10 @@ public class TSpecdevYlrq extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 备注 */
+    @Excel(name = "备注2")
+    private String remarks2;
+
     /** 状态 1 ：正常 ；0：删除 */
     private Long delFlag;
 
@@ -729,6 +733,14 @@ public class TSpecdevYlrq extends BaseEntity
         this.factoryNo = factoryNo;
     }
 
+    public String getRemarks2() {
+        return remarks2;
+    }
+
+    public void setRemarks2(String remarks2) {
+        this.remarks2 = remarks2;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiCc.java

@@ -84,6 +84,10 @@ public class TSpechiCc extends BaseEntity
     @Excel(name = "备注")
     private String remarks;
 
+    /** 备注 */
+    @Excel(name = "备注2")
+    private String remarks2;
+
     /** 审核状态 */
     @Excel(name = "审核状态")
     private Long approveStatus;
@@ -680,6 +684,14 @@ public class TSpechiCc extends BaseEntity
         this.plantMaint = plantMaint;
     }
 
+    public String getRemarks2() {
+        return remarks2;
+    }
+
+    public void setRemarks2(String remarks2) {
+        this.remarks2 = remarks2;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiDt.java

@@ -201,6 +201,10 @@ public class TSpechiDt extends BaseEntity
     @Excel(name = "操作类型")
     private String operType;
 
+    /** 备注 */
+    @Excel(name = "备注2")
+    private String remarks2;
+
     public String getOperName() {
         return operName;
     }
@@ -591,6 +595,14 @@ public class TSpechiDt extends BaseEntity
         this.plantMaint = plantMaint;
     }
 
+    public String getRemarks2() {
+        return remarks2;
+    }
+
+    public void setRemarks2(String remarks2) {
+        this.remarks2 = remarks2;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiDzsb.java

@@ -202,6 +202,10 @@ public class TSpechiDzsb extends BaseEntity
     @Excel(name = "操作类型")
     private String operType;
 
+    /** 备注 */
+    @Excel(name = "备注2")
+    private String remarks2;
+
     public String getOperName() {
         return operName;
     }
@@ -592,6 +596,14 @@ public class TSpechiDzsb extends BaseEntity
         this.devCode = devCode;
     }
 
+    public String getRemarks2() {
+        return remarks2;
+    }
+
+    public void setRemarks2(String remarks2) {
+        this.remarks2 = remarks2;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiGl.java

@@ -221,6 +221,10 @@ public class TSpechiGl extends BaseEntity
     @Excel(name = "操作类型")
     private String operType;
 
+    /** 备注 */
+    @Excel(name = "备注2")
+    private String remarks2;
+
     public String getOperName() {
         return operName;
     }
@@ -658,6 +662,14 @@ public class TSpechiGl extends BaseEntity
         return hiType;
     }
 
+    public String getRemarks2() {
+        return remarks2;
+    }
+
+    public void setRemarks2(String remarks2) {
+        this.remarks2 = remarks2;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiYlgd.java

@@ -265,6 +265,10 @@ public class TSpechiYlgd extends BaseEntity
     @Excel(name = "操作类型")
     private String operType;
 
+    /** 备注 */
+    @Excel(name = "备注2")
+    private String remarks2;
+
     public String getOperName() {
         return operName;
     }
@@ -800,6 +804,14 @@ public class TSpechiYlgd extends BaseEntity
         return hiType;
     }
 
+    public String getRemarks2() {
+        return remarks2;
+    }
+
+    public void setRemarks2(String remarks2) {
+        this.remarks2 = remarks2;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/his/domain/TSpechiYlrq.java

@@ -241,6 +241,10 @@ public class TSpechiYlrq extends BaseEntity
     @Excel(name = "操作类型")
     private String operType;
 
+    /** 备注 */
+    @Excel(name = "备注2")
+    private String remarks2;
+
     public String getOperName() {
         return operName;
     }
@@ -721,6 +725,14 @@ public class TSpechiYlrq extends BaseEntity
         this.factoryNo = factoryNo;
     }
 
+    public String getRemarks2() {
+        return remarks2;
+    }
+
+    public void setRemarks2(String remarks2) {
+        this.remarks2 = remarks2;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/service/impl/TSpecReportServiceImpl.java

@@ -315,6 +315,16 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         }
         List<Integer> numArr = new ArrayList<>();
         List<TSpecReport> ylrqList = tSpecReportMapper.selectExpriedYlrq(new TSpecReport());
+        // 判断超期原因
+        for (TSpecReport t:ylrqList
+             ) {
+           TSpecdevYlrq  d =  tSpecdevYlrqMapper.selectTSpecdevYlrqById(t.getId());
+            String re = checkApproveStatus(d.getApproveStatus()); //申请中超期
+            if (re != null) {
+                re = checkRemarks(d.getRemarks()+d.getRemarks2());//备注超期
+            }
+            d.setRemarks(re);
+        }
         numArr.add(ylrqList.size());
         logger.info(JSON.toJSONString(ylrqList));
         Row row = sheet.getRow(3);
@@ -325,6 +335,16 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         cell.setCellValue(getDevTotal(ylrqList));
 
         List<TSpecReport> ylgdList = tSpecReportMapper.selectExpriedYlgd(new TSpecReport());
+        // 判断超期原因
+        for (TSpecReport t:ylgdList
+        ) {
+            TSpecdevYlgd d =  tSpecdevYlgdMapper.selectTSpecdevYlgdById(t.getId());
+            String re = checkApproveStatus(d.getApproveStatus()); //申请中超期
+            if (re == null) {
+                re = checkRemarks(d.getRemarks()+d.getRemarks2());//备注超期
+            }
+            t.setRemarks(re);
+        }
         numArr.add(ylgdList.size());
         logger.info(JSON.toJSONString(ylgdList));
         Row row2 = sheet.getRow(3);
@@ -332,6 +352,16 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         cell2.setCellValue(getDevTotal(ylgdList));
 
         List<TSpecReport> glList = tSpecReportMapper.selectExpriedGl(new TSpecReport());
+        // 判断超期原因
+        for (TSpecReport t:glList
+        ) {
+            TSpecdevGl d =  tSpecdevGlMapper.selectTSpecdevGlById(t.getId());
+            String re = checkApproveStatus(d.getApproveStatus()); //申请中超期
+            if (re == null) {
+                re = checkRemarks(d.getRemarks()+d.getRemarks2());//备注超期
+            }
+            t.setRemarks(re);
+        }
         numArr.add(glList.size());
         logger.info(JSON.toJSONString(glList));
         Row row3 = sheet.getRow(3);
@@ -339,6 +369,17 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         cell3.setCellValue(getDevTotal(glList));
 
         List<TSpecReport> dtList = tSpecReportMapper.selectExpriedDt(new TSpecReport());
+        // 判断超期原因
+        for (TSpecReport t:dtList
+        ) {
+            TSpecdevDt d =  tSpecdevDtMapper.selectTSpecdevDtById(t.getId());
+            logger.info(JSON.toJSONString(d));
+            String re = checkApproveStatus(d.getApproveStatus()); //申请中超期
+            if (re == null) {
+                re = checkRemarks(d.getRemarks()+d.getRemarks2());//备注超期
+            }
+            t.setRemarks(re);
+        }
         numArr.add(dtList.size());
         logger.info(JSON.toJSONString(dtList));
         Row row4 = sheet.getRow(3);
@@ -346,6 +387,16 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         cell4.setCellValue(getDevTotal(dtList));
 
         List<TSpecReport> dzsbList = tSpecReportMapper.selectExpriedDzsb(new TSpecReport());
+        // 判断超期原因
+        for (TSpecReport t:dzsbList
+        ) {
+            TSpecdevDzsb d =  tSpecdevDzsbMapper.selectTSpecdevDzsbById(t.getId());
+            String re = checkApproveStatus(d.getApproveStatus()); //申请中超期
+            if (re == null) {
+                re = checkRemarks(d.getRemarks()+d.getRemarks2());//备注超期
+            }
+            t.setRemarks(re);
+        }
         numArr.add(dzsbList.size());
         logger.info(JSON.toJSONString(dzsbList));
         Row row5 = sheet.getRow(3);
@@ -353,6 +404,16 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         cell5.setCellValue(getDevTotal(dzsbList));
 
         List<TSpecReport> ccList = tSpecReportMapper.selectExpriedCc(new TSpecReport());
+        // 判断超期原因
+        for (TSpecReport t:ccList
+        ) {
+            TSpecdevCc d =  tSpecdevCcMapper.selectTSpecdevCcById(t.getId());
+            String re = checkApproveStatus(d.getApproveStatus()); //申请中超期
+            if (re == null) {
+                re = checkRemarks(d.getRemarks()+d.getRemarks2());//备注超期
+            }
+            t.setRemarks(re);
+        }
         numArr.add(ccList.size());
         logger.info(JSON.toJSONString(ccList));
         Row row6 = sheet.getRow(3);
@@ -382,6 +443,29 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         renderCell(wb,sheet,ccList,5,16);
     }
 
+    private String checkRemarks(String input) {
+        String[] keywords = {"报告未到", "已检等待报告", "等待报告","已检"};
+        for (String keyword : keywords) {
+            if (input.contains(keyword)) {
+                System.out.println("包含 '" + keyword + "'");
+                return "报告未到";
+            }
+        }
+        return null;
+    }
+
+    private String checkApproveStatus(Long approveStatus) {
+        if (approveStatus == 2) {
+            return "停用申请中";
+        }
+        if (approveStatus == 3) {
+            return "报废申请中";
+        }if (approveStatus == -1) {
+            return "注销申请中";
+        }
+        return null;
+    }
+
     // Excel 渲染
     private void replaceExcel(SXSSFWorkbook wb) {
         Sheet sheet;
@@ -623,6 +707,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         sheet.setColumnWidth(11, 26 * 256);
         sheet.setColumnWidth(12, 40 * 256);
         sheet.setColumnWidth(13, 40 * 256);
+        sheet.setColumnWidth(14, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -652,7 +737,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         row0.createCell(12).setCellValue("下次年度检查日期");
         row0.createCell(13).setCellValue("年度检查报告编号");
         row0.createCell(14).setCellValue("备注");
-
+        row0.createCell(15).setCellValue("备注2");
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -682,6 +767,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             }
             row.createCell(13).setCellValue(t.getYearReportNo());
             row.createCell(14).setCellValue(t.getRemarks());
+            row.createCell(15).setCellValue(t.getRemarks2());
             rowIndex++;
         }
     }
@@ -704,6 +790,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         sheet.setColumnWidth(11, 26 * 256);
         sheet.setColumnWidth(12, 40 * 256);
         sheet.setColumnWidth(13, 40 * 256);
+        sheet.setColumnWidth(14, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -742,6 +829,8 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         row0.getCell(13).setCellStyle(style);
         row0.createCell(14).setCellValue("备注");
         row0.getCell(14).setCellStyle(style);
+        row0.createCell(15).setCellValue("备注2");
+        row0.getCell(15).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -771,6 +860,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             }
             row.createCell(13).setCellValue(t.getYearReportNo());
             row.createCell(14).setCellValue(t.getRemarks());
+            row.createCell(15).setCellValue(t.getRemarks2());
             rowIndex++;
         }
 
@@ -794,6 +884,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         sheet.setColumnWidth(11, 26*256);
         sheet.setColumnWidth(12, 40*256);
         sheet.setColumnWidth(13, 40*256);
+        sheet.setColumnWidth(14, 40*256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -822,6 +913,8 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         row0.createCell(12).setCellValue("外部检验报告编号");row0.getCell(12).setCellStyle(style);
         row0.createCell(13).setCellValue("下次外部检验日期");row0.getCell(13).setCellStyle(style);
         row0.createCell(14).setCellValue("备注");row0.getCell(14).setCellStyle(style);
+        row0.createCell(15).setCellValue("备注2");row0.getCell(15).setCellStyle(style);
+
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -852,6 +945,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
                 row.createCell(13).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getOutNextWarnDate()));
             }
             row.createCell(14).setCellValue(t.getRemarks());
+            row.createCell(15).setCellValue(t.getRemarks2());
             rowIndex++;
         }
     }
@@ -870,6 +964,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         sheet.setColumnWidth(7, 26 * 256);
         sheet.setColumnWidth(8, 40 * 256);
         sheet.setColumnWidth(9, 40 * 256);
+        sheet.setColumnWidth(10, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -899,6 +994,8 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         row0.getCell(9).setCellStyle(style);
         row0.createCell(10).setCellValue("备注");
         row0.getCell(10).setCellStyle(style);
+        row0.createCell(11).setCellValue("备注2");
+        row0.getCell(11).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -920,6 +1017,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             }
             row.createCell(9).setCellValue(t.getPerTestConclusion());
             row.createCell(10).setCellValue(t.getRemarks());
+            row.createCell(11).setCellValue(t.getRemarks2());
             rowIndex++;
         }
     }
@@ -938,6 +1036,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         sheet.setColumnWidth(7, 26 * 256);
         sheet.setColumnWidth(8, 40 * 256);
         sheet.setColumnWidth(9, 40 * 256);
+        sheet.setColumnWidth(10, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -966,6 +1065,8 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         row0.getCell(9).setCellStyle(style);
         row0.createCell(10).setCellValue("备注");
         row0.getCell(10).setCellStyle(style);
+        row0.createCell(11).setCellValue("备注2");
+        row0.getCell(11).setCellStyle(style);
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -987,6 +1088,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             }
             row.createCell(9).setCellValue(t.getPerTestConclusion());
             row.createCell(10).setCellValue(t.getRemarks());
+            row.createCell(11).setCellValue(t.getRemarks2());
             rowIndex++;
         }
     }
@@ -1004,6 +1106,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         sheet.setColumnWidth(6, 26 * 256);
         sheet.setColumnWidth(7, 26 * 256);
         sheet.setColumnWidth(8, 40 * 256);
+        sheet.setColumnWidth(9, 40 * 256);
         //设置开始行和开始列
 
         Row row0 = sheet.createRow(0);
@@ -1019,6 +1122,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         row0.createCell(6).setCellValue("报告编号");
         row0.createCell(7).setCellValue("定期检验结论");
         row0.createCell(8).setCellValue("备注");
+        row0.createCell(9).setCellValue("备注2");
         //填充数据
         int rowIndex = 1;
         int columnIndex = 1;
@@ -1038,6 +1142,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             row.createCell(6).setCellValue(t.getReportNo());
             row.createCell(7).setCellValue(t.getPerTestConclusion());
             row.createCell(8).setCellValue(t.getRemarks());
+            row.createCell(9).setCellValue(t.getRemarks2());
             rowIndex++;
         }
     }

master/src/main/resources/mybatis/sems/TSpecReportMapper.xml

@@ -45,37 +45,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectExpriedYlrq" parameterType="TSpecReport" resultMap="TSpecReportResult">
-        SELECT plant_code as plantCode, COUNT(*) as devNum
+        SELECT plant_code as plantCode, COUNT(*) as devNum ,Max(id) AS id
         FROM T_SPECDEV_YLRQ
         WHERE SYSDATE  >  NEXT_WARN_DATE and DEL_FLAG = 0 and STATUS = 1
         GROUP BY plant_code
     </select>
     <select id="selectExpriedYlgd" parameterType="TSpecReport" resultMap="TSpecReportResult">
-        SELECT plant_code as plantCode, COUNT(*) as devNum
+        SELECT plant_code as plantCode, COUNT(*) as devNum,Max(id) AS id
         FROM T_SPECDEV_YLGD
         WHERE SYSDATE  >  NEXT_WARN_DATE and DEL_FLAG = 0 and STATUS = 1
         GROUP BY plant_code
     </select>
     <select id="selectExpriedGl" parameterType="TSpecReport" resultMap="TSpecReportResult">
-        SELECT plant_code as plantCode, COUNT(*) as devNum
+        SELECT plant_code as plantCode, COUNT(*) as devNum,Max(id) AS id
         FROM T_SPECDEV_GL
         WHERE SYSDATE  >  NEXT_WARN_DATE and DEL_FLAG = 0 and STATUS = 1
         GROUP BY plant_code
     </select>
     <select id="selectExpriedDt" parameterType="TSpecReport" resultMap="TSpecReportResult">
-        SELECT plant_code as plantCode, COUNT(*) as devNum
+        SELECT plant_code as plantCode, COUNT(*) as devNum,Max(id) AS id
         FROM T_SPECDEV_DT
         WHERE SYSDATE  >  NEXT_WARN_DATE and DEL_FLAG = 0 and STATUS = 1
         GROUP BY plant_code
     </select>
     <select id="selectExpriedDzsb" parameterType="TSpecReport" resultMap="TSpecReportResult">
-        SELECT plant_code as plantCode, COUNT(*) as devNum
+        SELECT plant_code as plantCode, COUNT(*) as devNum,Max(id) AS id
         FROM T_SPECDEV_DZSB
         WHERE SYSDATE  >  NEXT_WARN_DATE and DEL_FLAG = 0 and STATUS = 1
         GROUP BY plant_code
     </select>
     <select id="selectExpriedCc" parameterType="TSpecReport" resultMap="TSpecReportResult">
-        SELECT plant_code as plantCode, COUNT(*) as devNum
+        SELECT plant_code as plantCode, COUNT(*) as devNum,Max(id) AS id
         FROM T_SPECDEV_CC
         WHERE SYSDATE  >  NEXT_WARN_DATE and DEL_FLAG = 0 and STATUS = 1
         GROUP BY plant_code
@@ -122,37 +122,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectExpriedYlrqHi" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code AS plantCode, COUNT(*) AS devNum, OPER_TYPE AS remarks
         FROM T_SPECHI_YLRQ
-        WHERE OPER_TIME >= SYSDATE - INTERVAL '1' MONTH and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
+        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
         GROUP BY plant_code,OPER_TYPE
     </select>
     <select id="selectExpriedYlgdHi" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code AS plantCode, COUNT(*) AS devNum, OPER_TYPE AS remarks
         FROM T_SPECHI_YLGD
-        WHERE OPER_TIME >= SYSDATE - INTERVAL '1' MONTH and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
+        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
         GROUP BY plant_code,OPER_TYPE
     </select>
     <select id="selectExpriedGlHi" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code AS plantCode, COUNT(*) AS devNum, OPER_TYPE AS remarks
         FROM T_SPECHI_GL
-        WHERE OPER_TIME >= SYSDATE - INTERVAL '1' MONTH and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
+        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
         GROUP BY plant_code,OPER_TYPE
     </select>
     <select id="selectExpriedDtHi" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code AS plantCode, COUNT(*) AS devNum, OPER_TYPE AS remarks
         FROM T_SPECHI_DT
-        WHERE OPER_TIME >= SYSDATE - INTERVAL '1' MONTH and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
+        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM')  and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
         GROUP BY plant_code,OPER_TYPE
     </select>
     <select id="selectExpriedDzsbHi" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code AS plantCode, COUNT(*) AS devNum, OPER_TYPE AS remarks
         FROM T_SPECHI_DZSB
-        WHERE OPER_TIME >= SYSDATE - INTERVAL '1' MONTH and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
+        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
         GROUP BY plant_code,OPER_TYPE
     </select>
     <select id="selectExpriedCcHi" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code AS plantCode, COUNT(*) AS devNum, OPER_TYPE AS remarks
         FROM T_SPECHI_CC
-        WHERE OPER_TIME >= SYSDATE - INTERVAL '1' MONTH and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
+        WHERE OPER_TIME >= TRUNC(ADD_MONTHS(SYSDATE, -1), 'MM') and OPER_TYPE in ('新增-通过','删除-通过','停用批准','注销批准')
         GROUP BY plant_code,OPER_TYPE
     </select>
 

master/src/main/resources/mybatis/sems/TSpecdevCcMapper.xml

@@ -20,6 +20,7 @@
         <result property="updatedate" column="updatedate"/>
         <result property="deptId" column="dept_id"/>
         <result property="remarks" column="remarks"/>
+        <result property="remarks2" column="remarks2"/>
         <result property="approveStatus" column="approve_status"/>
         <result property="regno" column="regno"/>
         <result property="useno" column="useno"/>
@@ -71,6 +72,7 @@
                d.updatedate,
                d.dept_id,
                d.remarks,
+               d.remarks2,
                d.approve_status,
                d.regno,
                d.useno,
@@ -127,6 +129,10 @@
                 or unit like concat(concat('%', #{searchValue}), '%')
                 or devname like concat(concat('%', #{searchValue}), '%')
                 or devno like concat(concat('%', #{searchValue}), '%')
+                or remarks like concat(concat('%', #{searchValue}), '%')
+                or remarks2 like concat(concat('%', #{searchValue}), '%')
+                or report_no like concat(concat('%', #{searchValue}), '%')
+
                 )
             </if>
             <if test="isRepeat != null  and isRepeat != ''">
@@ -165,6 +171,7 @@
                d.updatedate,
                d.dept_id,
                d.remarks,
+               d.remarks2,
                d.approve_status,
                d.regno,
                d.useno,
@@ -256,6 +263,7 @@
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -304,6 +312,7 @@
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -355,6 +364,7 @@
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>
@@ -408,6 +418,7 @@
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>

master/src/main/resources/mybatis/sems/TSpecdevDtMapper.xml

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updaterDate"    column="updater_date"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="remarks2"    column="remarks2"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="regno"    column="regno"    />
         <result property="useno"    column="useno"    />
@@ -49,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTSpecdevDtVo">
-        select d.id, d.plant_code,d.plant_maint,d.use_dept, d.unit, d.devname, d.devno, d.createdate, d.submitdate, d.status, d.del_flag, d.creater_code, d.creater_date, d.updater_code, d.updater_date, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.model, d.capacity, d.floor, d.create_unit, d.maint_contractor, d.location, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.report_no ,s.dept_name,
+        select d.id, d.plant_code,d.plant_maint,d.use_dept, d.unit, d.devname, d.devno, d.createdate, d.submitdate, d.status, d.del_flag, d.creater_code, d.creater_date, d.updater_code, d.updater_date, d.dept_id, d.remarks,d.remarks2,  d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.model, d.capacity, d.floor, d.create_unit, d.maint_contractor, d.location, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.report_no ,s.dept_name,
         (SELECT COUNT(1) from T_SPECHI_DT h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag, per_test_conclusion
         ,d.is_repeat
         from t_specdev_dt d
@@ -72,6 +73,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 or unit like concat(concat('%', #{searchValue}), '%')
                 or devname like concat(concat('%', #{searchValue}), '%')
                 or devno like concat(concat('%', #{searchValue}), '%')
+                or remarks like concat(concat('%', #{searchValue}), '%')
+                or remarks2 like concat(concat('%', #{searchValue}), '%')
+                or report_no like concat(concat('%', #{searchValue}), '%')
+
                 )
             </if>
             <if test="isRepeat != null  and isRepeat != ''">
@@ -93,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectExpiredDt" parameterType="TSpecdevDt" resultMap="TSpecdevDtResult">
-        select d.id, d.plant_code,d.plant_maint,d.use_dept, d.unit, d.devname, d.devno, d.createdate, d.submitdate, d.status, d.del_flag, d.creater_code, d.creater_date, d.updater_code, d.updater_date, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.model, d.capacity, d.floor, d.create_unit, d.maint_contractor, d.location, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.report_no
+        select d.id, d.plant_code,d.plant_maint,d.use_dept, d.unit, d.devname, d.devno, d.createdate, d.submitdate, d.status, d.del_flag, d.creater_code, d.creater_date, d.updater_code, d.updater_date, d.dept_id, d.remarks, d.remarks2,d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.model, d.capacity, d.floor, d.create_unit, d.maint_contractor, d.location, d.check_strategy, d.first_warn_date, d.check_unit, d.docno, d.approve_time, d.change_time, d.report_no
         from t_specdev_dt d
         where SYSDATE > NEXT_WARN_DATE
           and DEL_FLAG = 0
@@ -164,6 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterDate != null">updater_date,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -204,6 +210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterDate != null">#{updaterDate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -247,6 +254,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterDate != null">updater_date = #{updaterDate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>
@@ -292,6 +300,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updaterDate != null">updater_date = #{updaterDate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>

master/src/main/resources/mybatis/sems/TSpecdevDzsbMapper.xml

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="remarks2"    column="remarks2"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="regno"    column="regno"    />
         <result property="useno"    column="useno"    />
@@ -48,7 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTSpecdevDzsbVo">
-        select d.id, d.plant_code, d.unit, d.devname,d.dev_code,d.factory_no, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.plant_maint, d.docno, d.model, d.capacity, d.location, d.create_unit, d.check_strategy, d.year_maint, d.report_no, d.approve_time, d.change_time, d.check_unit, d.engineer, d.is_ex  ,s.dept_name,
+        select d.id, d.plant_code, d.unit, d.devname,d.dev_code,d.factory_no, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks,d.remarks2, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.plant_maint, d.docno, d.model, d.capacity, d.location, d.create_unit, d.check_strategy, d.year_maint, d.report_no, d.approve_time, d.change_time, d.check_unit, d.engineer, d.is_ex  ,s.dept_name,
         (SELECT COUNT(1) from T_SPECHI_DZSB h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag, per_test_conclusion
                 ,d.is_repeat
         from t_specdev_dzsb d
@@ -72,6 +73,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 or unit like concat(concat('%', #{searchValue}), '%')
                 or devname like concat(concat('%', #{searchValue}), '%')
                 or devno like concat(concat('%', #{searchValue}), '%')
+                or remarks like concat(concat('%', #{searchValue}), '%')
+                or remarks2 like concat(concat('%', #{searchValue}), '%')
+                or report_no like concat(concat('%', #{searchValue}), '%')
+
                 )
             </if>
             <if test="isRepeat != null  and isRepeat != ''">
@@ -93,7 +98,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectExpiredDzsb" parameterType="TSpecdevDzsb" resultMap="TSpecdevDzsbResult">
-        select d.id, d.plant_code, d.unit, d.devname,d.dev_code,d.factory_no, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.plant_maint, d.docno, d.model, d.capacity, d.location, d.create_unit, d.check_strategy, d.year_maint, d.report_no, d.approve_time, d.change_time, d.check_unit, d.engineer, d.is_ex
+        select d.id, d.plant_code, d.unit, d.devname,d.dev_code,d.factory_no, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks,d.remarks2, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.plant_maint, d.docno, d.model, d.capacity, d.location, d.create_unit, d.check_strategy, d.year_maint, d.report_no, d.approve_time, d.change_time, d.check_unit, d.engineer, d.is_ex
         from t_specdev_dzsb d
         where SYSDATE > NEXT_WARN_DATE
           and DEL_FLAG = 0
@@ -157,6 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -197,6 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -240,6 +247,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>
@@ -285,6 +293,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>

master/src/main/resources/mybatis/sems/TSpecdevGlMapper.xml

@@ -19,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedate"    column="updatedate"    />
         <result property="deptId"    column="dept_id"    />
         <result property="remarks"    column="remarks"    />
+        <result property="remarks2"    column="remarks2"    />
         <result property="approveStatus"    column="approve_status"    />
         <result property="regno"    column="regno"    />
         <result property="useno"    column="useno"    />
@@ -52,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTSpecdevGlVo">
-        select d.id, d.plant_code, d.unit, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.create_unit, d.burn_mode, d.burn_kind, d.rated_power, d.des_pressure, d.des_temp, d.opt_pressure, d.opt_temp, d.check_unit, d.check_conclusion, d.model, d.water_mode, d.report_no, d.approve_time, d.change_time, d.plant_maint, d.out_warn_date, d.out_next_warn_date, d.out_check_conclusion, d.out_report_no, d.engineer ,s.dept_name,
+        select d.id, d.plant_code, d.unit, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks,d.remarks2, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.create_unit, d.burn_mode, d.burn_kind, d.rated_power, d.des_pressure, d.des_temp, d.opt_pressure, d.opt_temp, d.check_unit, d.check_conclusion, d.model, d.water_mode, d.report_no, d.approve_time, d.change_time, d.plant_maint, d.out_warn_date, d.out_next_warn_date, d.out_check_conclusion, d.out_report_no, d.engineer ,s.dept_name,
         (SELECT COUNT(1) from T_SPECHI_GL h  where h.DEV_ID = d.id and HI_TYPE = 0 ) as hiFlag
         ,d.is_repeat
         from t_specdev_gl d
@@ -98,7 +99,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 or regno like concat(concat('%', #{searchValue}), '%')
                 or devno like concat(concat('%', #{searchValue}), '%')
                 or useno like concat(concat('%', #{searchValue}), '%')
-               )
+                or remarks like concat(concat('%', #{searchValue}), '%')
+                or remarks2 like concat(concat('%', #{searchValue}), '%')
+                or report_no like concat(concat('%', #{searchValue}), '%')
+                or out_report_no like concat(concat('%', #{searchValue}), '%')
+                )
             </if>
             <if test="isRepeat != null  and isRepeat != ''">
                 <if test="isRepeat == 2 ">
@@ -119,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectExpiredGl" parameterType="TSpecdevGl" resultMap="TSpecdevGlResult">
-        select d.id, d.plant_code, d.unit, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.create_unit, d.burn_mode, d.burn_kind, d.rated_power, d.des_pressure, d.des_temp, d.opt_pressure, d.opt_temp, d.check_unit, d.check_conclusion, d.model, d.water_mode, d.report_no, d.approve_time, d.change_time, d.plant_maint, d.out_warn_date, d.out_next_warn_date, d.out_check_conclusion, d.out_report_no, d.engineer
+        select d.id, d.plant_code, d.unit, d.devname, d.devno, d.submitdate, d.status, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks,d.remarks2, d.approve_status, d.regno, d.useno, d.warn_date, d.warn_cycle, d.next_warn_date, d.warn_flag, d.create_unit, d.burn_mode, d.burn_kind, d.rated_power, d.des_pressure, d.des_temp, d.opt_pressure, d.opt_temp, d.check_unit, d.check_conclusion, d.model, d.water_mode, d.report_no, d.approve_time, d.change_time, d.plant_maint, d.out_warn_date, d.out_next_warn_date, d.out_check_conclusion, d.out_report_no, d.engineer
         from t_specdev_gl d
         where SYSDATE > NEXT_WARN_DATE
           and DEL_FLAG = 0
@@ -182,6 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -226,6 +232,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -273,6 +280,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>
@@ -322,6 +330,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>

master/src/main/resources/mybatis/sems/TSpecdevYlgdMapper.xml

@@ -19,6 +19,7 @@
         <result property="updatedate" column="updatedate"/>
         <result property="deptId" column="dept_id"/>
         <result property="remarks" column="remarks"/>
+        <result property="remarks2" column="remarks2"/>
         <result property="approveStatus" column="approve_status"/>
         <result property="regno" column="regno"/>
         <result property="useno" column="useno"/>
@@ -78,6 +79,7 @@
                d.updatedate,
                d.dept_id,
                d.remarks,
+               d.remarks2,
                d.approve_status,
                d.regno,
                d.useno,
@@ -178,6 +180,11 @@
                 or des_temp like concat(concat('%', #{searchValue}), '%')
                 or opt_pressure like concat(concat('%', #{searchValue}), '%')
                 or opt_temp like concat(concat('%', #{searchValue}), '%')
+                or remarks like concat(concat('%', #{searchValue}), '%')
+                or remarks2 like concat(concat('%', #{searchValue}), '%')
+                or report_no like concat(concat('%', #{searchValue}), '%')
+                or year_report_no like concat(concat('%', #{searchValue}), '%')
+
                 )
             </if>
             <if test="isRepeat != null  and isRepeat != ''">
@@ -213,6 +220,7 @@
                d.updatedate,
                d.dept_id,
                d.remarks,
+               d.remarks2,
                d.approve_status,
                d.regno,
                d.useno,
@@ -327,6 +335,7 @@
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -382,6 +391,7 @@
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -440,6 +450,7 @@
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>
@@ -501,6 +512,7 @@
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>

master/src/main/resources/mybatis/sems/TSpecdevYlrqMapper.xml

@@ -19,6 +19,7 @@
         <result property="updatedate" column="updatedate"/>
         <result property="deptId" column="dept_id"/>
         <result property="remarks" column="remarks"/>
+        <result property="remarks2" column="remarks2"/>
         <result property="approveStatus" column="approve_status"/>
         <result property="regno" column="regno"/>
         <result property="useno" column="useno"/>
@@ -73,6 +74,7 @@
                d.updatedate,
                d.dept_id,
                d.remarks,
+               d.remarks2,
                d.approve_status,
                d.regno,
                d.useno,
@@ -142,6 +144,11 @@
                 or unit like concat(concat('%', #{searchValue}), '%')
                 or devname like concat(concat('%', #{searchValue}), '%')
                 or devno like concat(concat('%', #{searchValue}), '%')
+                or remarks like concat(concat('%', #{searchValue}), '%')
+                or remarks2 like concat(concat('%', #{searchValue}), '%')
+                or report_no like concat(concat('%', #{searchValue}), '%')
+                or year_report_no like concat(concat('%', #{searchValue}), '%')
+
                 )
             </if>
             <if test="isRepeat != null  and isRepeat != ''">
@@ -178,6 +185,7 @@
                d.updatedate,
                d.dept_id,
                d.remarks,
+               d.remarks2,
                d.approve_status,
                d.regno,
                d.useno,
@@ -273,6 +281,7 @@
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -322,6 +331,7 @@
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -374,6 +384,7 @@
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>
@@ -429,6 +440,7 @@
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>

master/src/main/resources/mybatis/sems/his/TSpechiCcMapper.xml

@@ -20,6 +20,7 @@
         <result property="updatedate" column="updatedate"/>
         <result property="deptId" column="dept_id"/>
         <result property="remarks" column="remarks"/>
+        <result property="remarks2" column="remarks2"/>
         <result property="approveStatus" column="approve_status"/>
         <result property="regno" column="regno"/>
         <result property="useno" column="useno"/>
@@ -78,6 +79,7 @@
                d.updatedate,
                d.dept_id,
                d.remarks,
+               d.remarks2,
                d.approve_status,
                d.regno,
                d.useno,
@@ -160,6 +162,7 @@
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -207,6 +210,7 @@
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -261,6 +265,7 @@
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -311,6 +316,7 @@
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -365,6 +371,7 @@
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>

master/src/main/resources/mybatis/sems/his/TSpechiDtMapper.xml

@@ -20,6 +20,7 @@
         <result property="updaterDate" column="updater_date"/>
         <result property="deptId" column="dept_id"/>
         <result property="remarks" column="remarks"/>
+        <result property="remarks2" column="remarks2"/>
         <result property="approveStatus" column="approve_status"/>
         <result property="regno" column="regno"/>
         <result property="useno" column="useno"/>
@@ -71,6 +72,7 @@
                d.updater_date,
                d.dept_id,
                d.remarks,
+               d.remarks2,
                d.approve_status,
                d.regno,
                d.useno,
@@ -147,6 +149,7 @@
             <if test="updaterDate != null">updater_date,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -187,6 +190,7 @@
             <if test="updaterDate != null">#{updaterDate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -234,6 +238,7 @@
             <if test="updaterDate != null">updater_date,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -277,6 +282,7 @@
             <if test="updaterDate != null">#{updaterDate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -324,6 +330,7 @@
             <if test="updaterDate != null">updater_date = #{updaterDate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>

master/src/main/resources/mybatis/sems/his/TSpechiDzsbMapper.xml

@@ -19,6 +19,7 @@
         <result property="updatedate" column="updatedate"/>
         <result property="deptId" column="dept_id"/>
         <result property="remarks" column="remarks"/>
+        <result property="remarks2" column="remarks2"/>
         <result property="approveStatus" column="approve_status"/>
         <result property="regno" column="regno"/>
         <result property="useno" column="useno"/>
@@ -70,6 +71,7 @@
                d.updatedate,
                d.dept_id,
                d.remarks,
+               d.remarks2,
                d.approve_status,
                d.regno,
                d.useno,
@@ -145,6 +147,7 @@
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -185,6 +188,7 @@
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -232,6 +236,7 @@
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -275,6 +280,7 @@
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -322,6 +328,7 @@
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>

master/src/main/resources/mybatis/sems/his/TSpechiGlMapper.xml

@@ -19,6 +19,7 @@
         <result property="updatedate" column="updatedate"/>
         <result property="deptId" column="dept_id"/>
         <result property="remarks" column="remarks"/>
+        <result property="remarks2" column="remarks2"/>
         <result property="approveStatus" column="approve_status"/>
         <result property="regno" column="regno"/>
         <result property="useno" column="useno"/>
@@ -73,6 +74,7 @@
                d.updatedate,
                d.dept_id,
                d.remarks,
+               d.remarks2,
                d.approve_status,
                d.regno,
                d.useno,
@@ -155,6 +157,7 @@
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -200,6 +203,7 @@
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -252,6 +256,7 @@
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -300,6 +305,7 @@
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -352,6 +358,7 @@
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>

master/src/main/resources/mybatis/sems/his/TSpechiYlgdMapper.xml

@@ -19,6 +19,7 @@
         <result property="updatedate" column="updatedate"/>
         <result property="deptId" column="dept_id"/>
         <result property="remarks" column="remarks"/>
+        <result property="remarks2" column="remarks2"/>
         <result property="approveStatus" column="approve_status"/>
         <result property="regno" column="regno"/>
         <result property="useno" column="useno"/>
@@ -84,6 +85,7 @@
                d.updatedate,
                d.dept_id,
                d.remarks,
+               d.remarks2,
                d.approve_status,
                d.regno,
                d.useno,
@@ -177,6 +179,7 @@
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -233,6 +236,7 @@
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -296,6 +300,7 @@
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -355,6 +360,7 @@
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -418,6 +424,7 @@
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>

master/src/main/resources/mybatis/sems/his/TSpechiYlrqMapper.xml

@@ -19,6 +19,7 @@
         <result property="updatedate" column="updatedate"/>
         <result property="deptId" column="dept_id"/>
         <result property="remarks" column="remarks"/>
+        <result property="remarks2" column="remarks2"/>
         <result property="approveStatus" column="approve_status"/>
         <result property="regno" column="regno"/>
         <result property="useno" column="useno"/>
@@ -79,6 +80,7 @@
                d.updatedate,
                d.dept_id,
                d.remarks,
+               d.remarks2,
                d.approve_status,
                d.regno,
                d.useno,
@@ -165,6 +167,7 @@
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -215,6 +218,7 @@
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -273,6 +277,7 @@
             <if test="updatedate != null">updatedate,</if>
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
+            <if test="remarks2 != null">remarks2,</if>
             <if test="approveStatus != null">approve_status,</if>
             <if test="regno != null">regno,</if>
             <if test="useno != null">useno,</if>
@@ -326,6 +331,7 @@
             <if test="updatedate != null">#{updatedate},</if>
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
+            <if test="remarks2 != null">#{remarks2},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
             <if test="regno != null">#{regno},</if>
             <if test="useno != null">#{useno},</if>
@@ -383,6 +389,7 @@
             <if test="updatedate != null">updatedate = #{updatedate},</if>
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null">remarks = #{remarks},</if>
+            <if test="remarks2 != null">remarks2 = #{remarks2},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
             <if test="regno != null">regno = #{regno},</if>
             <if test="useno != null">useno = #{useno},</if>

ui/src/views/sems/safecheck/agent-dailycheck/index.vue

@@ -112,7 +112,7 @@
           :disabled="multiple"
           @click="handleBatchConfirm"
           v-hasPermi="['safecheck:weekcheck:edit']"
-        >批量确认</el-button>
+        >批量锁定</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -122,7 +122,7 @@
           :disabled="multiple"
           @click="handleBatchCancel"
           v-hasPermi="['safecheck:weekcheck:edit']"
-        >取消确认</el-button>
+        >取消锁定</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -582,11 +582,11 @@ export default {
     isConfirmFormat(row, column) {
       let type = 'info';
       if (row.isConfirm == 0) {
-        let s = '未确认'
+        let s = '未锁定'
         return <el-tag type={type}>{s}</el-tag>;
       }
       if (row.isConfirm == 1) {
-        let s = '已确认'
+        let s = '已锁定'
         type = 'success';
         return <el-tag type={type}>{s}</el-tag>;
       }
@@ -666,7 +666,7 @@ export default {
       })
       for (let i = 0; i < rows.length; i++) {
         if (rows[i].isConfirm != 0) {
-          this.$alert("已确认，无法修改", this.$t('提示'), {
+          this.$alert("已锁定，无法修改", this.$t('提示'), {
             type: 'warning'
           })
           return
@@ -706,7 +706,7 @@ export default {
       })
       for (let i = 0; i < rows.length; i++) {
         if (rows[i].isConfirm != 0) {
-          this.$alert("已确认，无法删除", this.$t('提示'), {
+          this.$alert("已锁定，无法删除", this.$t('提示'), {
             type: 'warning'
           })
           return
@@ -858,7 +858,7 @@ export default {
     /** 批量按钮操作 */
     handleBatchConfirm(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认?', "警告", {
+      this.$confirm('是否锁定?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -872,7 +872,7 @@ export default {
     /** 批量按钮操作 */
     handleBatchCancel(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否取消确认?', "警告", {
+      this.$confirm('是否取消锁定?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

ui/src/views/sems/safecheck/agent-personweekcheck/index.vue

@@ -88,7 +88,7 @@
           :disabled="multiple"
           @click="handleBatchConfirm"
           v-hasPermi="['safecheck:weekcheck:edit']"
-        >批量确认</el-button>
+        >批量锁定</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -98,7 +98,7 @@
           :disabled="multiple"
           @click="handleBatchCancel"
           v-hasPermi="['safecheck:weekcheck:edit']"
-        >取消确认</el-button>
+        >取消锁定</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -405,11 +405,11 @@ export default {
     isConfirmFormat(row, column) {
       let type = 'info';
       if (row.isConfirm == 0) {
-        let s = '未确认'
+        let s = '未锁定'
         return <el-tag type={type}>{s}</el-tag>;
       }
       if (row.isConfirm == 1) {
-        let s = '已确认'
+        let s = '已锁定'
         type = 'success';
         return <el-tag type={type}>{s}</el-tag>;
       }
@@ -477,7 +477,7 @@ export default {
       })
       for (let i = 0; i < rows.length; i++) {
         if (rows[i].isConfirm != 0) {
-          this.$alert("已确认，无法修改", this.$t('提示'), {
+          this.$alert("已锁定，无法修改", this.$t('提示'), {
             type: 'warning'
           })
           return
@@ -527,7 +527,7 @@ export default {
       })
       for (let i = 0; i < rows.length; i++) {
         if (rows[i].isConfirm != 0) {
-          this.$alert("已确认，无法删除", this.$t('提示'), {
+          this.$alert("已锁定，无法删除", this.$t('提示'), {
             type: 'warning'
           })
           return
@@ -594,7 +594,7 @@ export default {
     /** 批量按钮操作 */
     handleBatchConfirm(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认?', "警告", {
+      this.$confirm('是否锁定?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -608,7 +608,7 @@ export default {
     /** 批量按钮操作 */
     handleBatchCancel(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否取消确认?', "警告", {
+      this.$confirm('是否取消锁定?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

ui/src/views/sems/safecheck/dailycheck/index.vue

@@ -114,7 +114,7 @@
           :disabled="multiple"
           @click="handleBatchConfirm"
           v-hasPermi="['safecheck:weekcheck:edit']"
-        >批量确认</el-button>
+        >批量锁定</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -124,7 +124,7 @@
           :disabled="multiple"
           @click="handleBatchCancel"
           v-hasPermi="['safecheck:weekcheck:edit']"
-        >取消确认</el-button>
+        >取消锁定</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -572,11 +572,11 @@ export default {
     isConfirmFormat(row, column) {
       let type = 'info';
       if (row.isConfirm == 0) {
-        let s = '未确认'
+        let s = '未锁定'
         return <el-tag type={type}>{s}</el-tag>;
       }
       if (row.isConfirm == 1) {
-        let s = '已确认'
+        let s = '已锁定'
         type = 'success';
         return <el-tag type={type}>{s}</el-tag>;
       }
@@ -658,7 +658,7 @@ export default {
       })
       for (let i = 0; i < rows.length; i++) {
         if (rows[i].isConfirm != 0) {
-          this.$alert("已确认，无法修改", this.$t('提示'), {
+          this.$alert("已锁定，无法修改", this.$t('提示'), {
             type: 'warning'
           })
           return
@@ -698,7 +698,7 @@ export default {
       })
       for (let i = 0; i < rows.length; i++) {
         if (rows[i].isConfirm != 0) {
-          this.$alert("已确认，无法删除", this.$t('提示'), {
+          this.$alert("已锁定，无法删除", this.$t('提示'), {
             type: 'warning'
           })
           return
@@ -850,7 +850,7 @@ export default {
     /** 批量按钮操作 */
     handleBatchConfirm(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认?', "警告", {
+      this.$confirm('是否锁定?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -864,7 +864,7 @@ export default {
     /** 批量按钮操作 */
     handleBatchCancel(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否取消确认?', "警告", {
+      this.$confirm('是否取消锁定?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

ui/src/views/sems/safecheck/personweekcheck/index.vue

@@ -90,7 +90,7 @@
           :disabled="multiple"
           @click="handleBatchConfirm"
           v-hasPermi="['safecheck:weekcheck:edit']"
-        >批量确认</el-button>
+        >批量锁定</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -100,7 +100,7 @@
           :disabled="multiple"
           @click="handleBatchCancel"
           v-hasPermi="['safecheck:weekcheck:edit']"
-        >取消确认</el-button>
+        >取消锁定</el-button>
       </el-col>
 	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -396,11 +396,11 @@ export default {
     isConfirmFormat(row, column) {
       let type = 'info';
       if (row.isConfirm == 0) {
-        let s = '未确认'
+        let s = '未锁定'
         return <el-tag type={type}>{s}</el-tag>;
       }
       if (row.isConfirm == 1) {
-        let s = '已确认'
+        let s = '已锁定'
         type = 'success';
         return <el-tag type={type}>{s}</el-tag>;
       }
@@ -470,7 +470,7 @@ export default {
       })
       for (let i = 0; i < rows.length; i++) {
         if (rows[i].isConfirm != 0) {
-          this.$alert("已确认，无法修改", this.$t('提示'), {
+          this.$alert("已锁定，无法修改", this.$t('提示'), {
             type: 'warning'
           })
           return
@@ -520,7 +520,7 @@ export default {
       })
       for (let i = 0; i < rows.length; i++) {
         if (rows[i].isConfirm != 0) {
-          this.$alert("已确认，无法删除", this.$t('提示'), {
+          this.$alert("已锁定，无法删除", this.$t('提示'), {
             type: 'warning'
           })
           return
@@ -587,7 +587,7 @@ export default {
     /** 批量按钮操作 */
     handleBatchConfirm(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否确认?', "警告", {
+      this.$confirm('是否锁定?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
@@ -601,7 +601,7 @@ export default {
     /** 批量按钮操作 */
     handleBatchCancel(row) {
       const ids = row.id || this.ids;
-      this.$confirm('是否取消确认?', "警告", {
+      this.$confirm('是否取消锁定?', "警告", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"

ui/src/views/sems/specCc/index.vue

@@ -208,6 +208,8 @@
       <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('资产归属形式')" align="center" prop="assetOwner" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('备注2')" align="center" prop="remarks2" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140"
                        class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -452,14 +454,9 @@
               <el-input v-model="form.perTestConclusion" :placeholder="$t('请输入')+ $t('定期检验结论')"/>
             </el-form-item>
           </el-col>
-          <!--          <el-col :span="12">
-                    <el-form-item :label="$t('归属部门')" prop="deptId">
-                        <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择')+ $t('归属部门')" />
-                    </el-form-item>
-                    </el-col>-->
         </el-row>
         <el-row>
-          <el-col>
+          <el-col :span="12">
             <el-form-item v-if="dataForm == 0" :label="$t('确认人')" prop="wxjl">
               <el-select v-model="form.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
                 <el-option
@@ -471,6 +468,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('备注2')" prop="remarks2">
+              <el-input v-model="form.remarks2" :placeholder="$t('请输入')+ $t('备注2')"/>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -819,6 +821,7 @@ export default {
         updatedate: null,
         deptId: null,
         remarks: null,
+        remarks2: null,
         perTestConclusion: null,
         approveStatus: 0,
         regno: null,

ui/src/views/sems/specDt/index.vue

@@ -214,6 +214,8 @@
       <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('备注2')" align="center" prop="remarks2" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140"
                        class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -421,9 +423,13 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!--          <el-form-item :label="$t('归属部门')" prop="deptId">
-                      <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" :placeholder="$t('请选择') + $t('归属部门')" />
-                  </el-form-item>-->
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('备注2')" prop="remarks2">
+              <el-input v-model="form.remarks2" :placeholder="$t('请输入') + $t('备注2')"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
@@ -761,6 +767,7 @@ export default {
         updaterDate: null,
         deptId: null,
         remarks: null,
+        remarks2: null,
         perTestConclusion: null,
         approveStatus: 0,
         regno: null,

ui/src/views/sems/specDzsb/index.vue

@@ -214,6 +214,8 @@
       <el-table-column :label="$t('检验报告编号')" align="center" prop="reportNo" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('定期检验结论')" align="center" prop="perTestConclusion" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('备注2')" align="center" prop="remarks2" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140"
                        class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -433,7 +435,7 @@
                     </el-col>-->
         </el-row>
         <el-row>
-          <el-col>
+          <el-col :span="12">
             <el-form-item v-if="dataForm == 0" :label="$t('确认人')" prop="wxjl">
               <el-select v-model="form.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
                 <el-option
@@ -445,6 +447,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('备注2')" prop="remarks2">
+              <el-input v-model="form.remarks2" :placeholder="$t('请输入')+ $t('备注2')"/>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -794,6 +801,7 @@ export default {
         updatedate: null,
         deptId: null,
         remarks: null,
+        remarks2: null,
         perTestConclusion: null,
         approveStatus: 0,
         regno: null,

ui/src/views/sems/specGl/index.vue

@@ -239,6 +239,8 @@
         </template>
       </el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('备注2')" align="center" prop="remarks2" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140"
                        class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -519,6 +521,13 @@
                     </el-form-item>
                     </el-col>-->
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('备注2')" prop="remarks2">
+              <el-input v-model="form.remarks2" :placeholder="$t('请输入')+ $t('备注2')"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
@@ -876,6 +885,7 @@ export default {
         updatedate: null,
         deptId: null,
         remarks: null,
+        remarks2: null,
         approveStatus: 0,
         regno: null,
         useno: null,

ui/src/views/sems/specYlgd/index.vue

@@ -308,6 +308,7 @@
       </u-table-column>
       <u-table-column :label="$t('年度检查报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true"/>
       <u-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('备注2')" align="center" prop="remarks2" :show-overflow-tooltip="true"/>
       <u-table-column :label="$t('操作')" align="center" fixed="right" width="170" class-name="small-padding">
         <template slot-scope="scope">
           <el-button
@@ -638,7 +639,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col>
+          <el-col :span="12">
             <el-form-item v-if="dataForm == 0" :label="$t('确认人')" prop="wxjl">
               <el-select v-model="form.wxjl" :placeholder="$t('请选择')+ $t('装置维修经理')" filterable clearable size="small">
                 <el-option
@@ -650,6 +651,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('备注2')" prop="remarks2">
+              <el-input v-model="form.remarks2" type="textarea" :placeholder="$t('请输入')+ $t('备注2')"/>
+            </el-form-item>
+          </el-col>
         </el-row>
 
       </el-form>
@@ -1019,6 +1025,7 @@ export default {
         updatedate: null,
         deptId: null,
         remarks: null,
+        remarks2: null,
         approveStatus: 0,
         regno: null,
         useno: null,

ui/src/views/sems/specYlrq/index.vue

@@ -248,6 +248,7 @@
       <u-table-column :label="$t('年度检查报告编号')" align="center" prop="yearReportNo" :show-overflow-tooltip="true"/>
       <!--      <u-table-column :label="$t('部门编号')" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
       <u-table-column :label="$t('备注')" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <u-table-column :label="$t('备注2')" align="center" prop="remarks2" :show-overflow-tooltip="true"/>
 
 
       <u-table-column :label="$t('操作')" align="center" fixed="right" width="170"
@@ -583,6 +584,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('备注2')" prop="remarks2">
+              <el-input v-model="form.remarks2" type="textarea" :placeholder="$t('请输入')+ $t('内容')"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">{{ $t('确 定') }}</el-button>
@@ -921,6 +929,7 @@ export default {
         updatedate: null,
         deptId: null,
         remarks: null,
+        remarks2: null,
         approveStatus: null,
         regno: null,
         useno: null,