ly 特种设备

master/pom.xml

@@ -6,7 +6,7 @@
     <groupId>com.cpms</groupId>
     <artifactId>cpms</artifactId>
     <version>3.2.0</version>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
 
     <name>cpms</name>
     <description>cpms管理系统</description>

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

@@ -32,6 +32,9 @@ public class TSpecReport extends BaseEntity
     @Excel(name = "明细URL")
     private String detailUrl;
 
+    /** 明细URL */
+    @Excel(name = "明细URL")
+    private String detail3Url;
     /** 类型 */
     @Excel(name = "类型")
     private Long reportType;
@@ -194,6 +197,14 @@ public class TSpecReport extends BaseEntity
         this.devNum = devNum;
     }
 
+    public String getDetail3Url() {
+        return detail3Url;
+    }
+
+    public void setDetail3Url(String detail3Url) {
+        this.detail3Url = detail3Url;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevCcMapper.java

@@ -75,5 +75,5 @@ public interface TSpecdevCcMapper extends BaseMapper<TSpecdevCc>
 
     void duplicateTSpecdevCc();
 
-    List<TSpecdevCc> selectExpiredCc();
+    List<TSpecdevCc> selectExpiredCc(Integer month);
 }

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevDtMapper.java

@@ -76,5 +76,5 @@ public interface TSpecdevDtMapper extends BaseMapper<TSpecdevDt>
 
     void duplicateTSpecdevDt();
 
-    List<TSpecdevDt> selectExpiredDt();
+    List<TSpecdevDt> selectExpiredDt(Integer month);
 }

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevDzsbMapper.java

@@ -76,5 +76,5 @@ public interface TSpecdevDzsbMapper extends BaseMapper<TSpecdevDzsb>
 
     void duplicateTSpecdevDzsb();
 
-    List<TSpecdevDzsb> selectExpiredDzsb();
+    List<TSpecdevDzsb> selectExpiredDzsb(Integer month);
 }

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevGlMapper.java

@@ -72,5 +72,5 @@ public interface TSpecdevGlMapper extends BaseMapper<TSpecdevGl>
 
     void duplicateTSpecdevGl();
 
-    List<TSpecdevGl> selectExpiredGl();
+    List<TSpecdevGl> selectExpiredGl(Integer month);
 }

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevYlgdMapper.java

@@ -82,5 +82,5 @@ public interface TSpecdevYlgdMapper extends BaseMapper<TSpecdevYlgd> {
 
     void syncReport(String valueOf);
 
-    List<TSpecdevYlgd> selectExpiredYlgd();
+    List<TSpecdevYlgd> selectExpiredYlgd(Integer month);
 }

master/src/main/java/com/ruoyi/project/sems/mapper/TSpecdevYlrqMapper.java

@@ -80,5 +80,6 @@ public interface TSpecdevYlrqMapper extends BaseMapper<TSpecdevYlrq> {
 
     void syncReport(TSpecdevYlrq tSpecdevYlrq);
 
-    List<TSpecdevYlrq> selectExpiredYlrq();
+    List<TSpecdevYlrq> selectExpiredYlrq(Integer month);
+
 }

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

@@ -120,7 +120,9 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             replaceExcelExpireByThreeMonth(wb);
             replaceExcelExpire(wb);
             //创建明细excel
-            String detailUrl = createDetailExcel(tSpecReport);
+            String detailUrl = createDetailExcel(tSpecReport, false);
+            //创建3个月明细excel
+            String detail3Url = createDetailExcel(tSpecReport, true);
 
             // Save the generated file
             File dir = new File(fileDir);
@@ -132,16 +134,17 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             LocalDate currentDate = LocalDate.now();
             DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
             String dateStr = currentDate.format(formatter);
-            String filePath = fileDir + "/" + dateStr + "Report" + tSpecReport.getId() +".xlsx";
+            String filePath = fileDir + "/" + dateStr + "Report" + tSpecReport.getId() + ".xlsx";
             fos = new FileOutputStream(filePath);
             wb.write(fos);
             //
             int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
             String currentDir = StringUtils.substring(filePath, dirLastIndex);
-            String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir ;
+            String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir;
             tSpecReport.setReportUrl(pathFileName);
             tSpecReport.setReportName(dateStr + "报告");
             tSpecReport.setDetailUrl(detailUrl);
+            tSpecReport.setDetail3Url(detail3Url);
             tSpecReportMapper.updateTSpecReport(tSpecReport);
         } catch (Exception e) {
             e.printStackTrace();
@@ -219,12 +222,12 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         );
         sheet.addMergedRegion(mergedRegion);
 
-        renderCell(wb,sheet,ylrqList,14,1  );
-        renderCell(wb,sheet,ylgdList,14,4);
-        renderCell(wb,sheet,glList,14,7);
-        renderCell(wb,sheet,dtList,14,10);
-        renderCell(wb,sheet,dzsbList,14,13);
-        renderCell(wb,sheet,ccList,14,16);
+        renderCell(wb, sheet, ylrqList, 14, 1);
+        renderCell(wb, sheet, ylgdList, 14, 4);
+        renderCell(wb, sheet, glList, 14, 7);
+        renderCell(wb, sheet, dtList, 14, 10);
+        renderCell(wb, sheet, dzsbList, 14, 13);
+        renderCell(wb, sheet, ccList, 14, 16);
     }
 
     //三个月到期渲染
@@ -297,13 +300,14 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         );
         sheet.addMergedRegion(mergedRegion);
 
-        renderCell(wb,sheet,ylrqList,10,1  );
-        renderCell(wb,sheet,ylgdList,10,4);
-        renderCell(wb,sheet,glList,10,7);
-        renderCell(wb,sheet,dtList,10,10);
-        renderCell(wb,sheet,dzsbList,10,13);
-        renderCell(wb,sheet,ccList,10,16);
+        renderCell(wb, sheet, ylrqList, 10, 1);
+        renderCell(wb, sheet, ylgdList, 10, 4);
+        renderCell(wb, sheet, glList, 10, 7);
+        renderCell(wb, sheet, dtList, 10, 10);
+        renderCell(wb, sheet, dzsbList, 10, 13);
+        renderCell(wb, sheet, ccList, 10, 16);
     }
+
     //过期渲染
     private void replaceExcelExpire(SXSSFWorkbook wb) {
         Sheet sheet;
@@ -316,12 +320,12 @@ 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());
+        for (TSpecReport t : ylrqList
+        ) {
+            TSpecdevYlrq d = tSpecdevYlrqMapper.selectTSpecdevYlrqById(t.getId());
             String re = checkApproveStatus(d.getApproveStatus()); //申请中超期
             if (re != null) {
-                re = checkRemarks(d.getRemarks()+d.getRemarks2());//备注超期
+                re = checkRemarks(d.getRemarks() + d.getRemarks2());//备注超期
             }
             d.setRemarks(re);
         }
@@ -336,12 +340,12 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
 
         List<TSpecReport> ylgdList = tSpecReportMapper.selectExpriedYlgd(new TSpecReport());
         // 判断超期原因
-        for (TSpecReport t:ylgdList
+        for (TSpecReport t : ylgdList
         ) {
-            TSpecdevYlgd d =  tSpecdevYlgdMapper.selectTSpecdevYlgdById(t.getId());
+            TSpecdevYlgd d = tSpecdevYlgdMapper.selectTSpecdevYlgdById(t.getId());
             String re = checkApproveStatus(d.getApproveStatus()); //申请中超期
             if (re == null) {
-                re = checkRemarks(d.getRemarks()+d.getRemarks2());//备注超期
+                re = checkRemarks(d.getRemarks() + d.getRemarks2());//备注超期
             }
             t.setRemarks(re);
         }
@@ -353,12 +357,12 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
 
         List<TSpecReport> glList = tSpecReportMapper.selectExpriedGl(new TSpecReport());
         // 判断超期原因
-        for (TSpecReport t:glList
+        for (TSpecReport t : glList
         ) {
-            TSpecdevGl d =  tSpecdevGlMapper.selectTSpecdevGlById(t.getId());
+            TSpecdevGl d = tSpecdevGlMapper.selectTSpecdevGlById(t.getId());
             String re = checkApproveStatus(d.getApproveStatus()); //申请中超期
             if (re == null) {
-                re = checkRemarks(d.getRemarks()+d.getRemarks2());//备注超期
+                re = checkRemarks(d.getRemarks() + d.getRemarks2());//备注超期
             }
             t.setRemarks(re);
         }
@@ -370,13 +374,13 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
 
         List<TSpecReport> dtList = tSpecReportMapper.selectExpriedDt(new TSpecReport());
         // 判断超期原因
-        for (TSpecReport t:dtList
+        for (TSpecReport t : dtList
         ) {
-            TSpecdevDt d =  tSpecdevDtMapper.selectTSpecdevDtById(t.getId());
+            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());//备注超期
+                re = checkRemarks(d.getRemarks() + d.getRemarks2());//备注超期
             }
             t.setRemarks(re);
         }
@@ -388,12 +392,12 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
 
         List<TSpecReport> dzsbList = tSpecReportMapper.selectExpriedDzsb(new TSpecReport());
         // 判断超期原因
-        for (TSpecReport t:dzsbList
+        for (TSpecReport t : dzsbList
         ) {
-            TSpecdevDzsb d =  tSpecdevDzsbMapper.selectTSpecdevDzsbById(t.getId());
+            TSpecdevDzsb d = tSpecdevDzsbMapper.selectTSpecdevDzsbById(t.getId());
             String re = checkApproveStatus(d.getApproveStatus()); //申请中超期
             if (re == null) {
-                re = checkRemarks(d.getRemarks()+d.getRemarks2());//备注超期
+                re = checkRemarks(d.getRemarks() + d.getRemarks2());//备注超期
             }
             t.setRemarks(re);
         }
@@ -405,12 +409,12 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
 
         List<TSpecReport> ccList = tSpecReportMapper.selectExpriedCc(new TSpecReport());
         // 判断超期原因
-        for (TSpecReport t:ccList
+        for (TSpecReport t : ccList
         ) {
-            TSpecdevCc d =  tSpecdevCcMapper.selectTSpecdevCcById(t.getId());
+            TSpecdevCc d = tSpecdevCcMapper.selectTSpecdevCcById(t.getId());
             String re = checkApproveStatus(d.getApproveStatus()); //申请中超期
             if (re == null) {
-                re = checkRemarks(d.getRemarks()+d.getRemarks2());//备注超期
+                re = checkRemarks(d.getRemarks() + d.getRemarks2());//备注超期
             }
             t.setRemarks(re);
         }
@@ -435,16 +439,16 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         );
         sheet.addMergedRegion(mergedRegion);
 
-        renderCell(wb,sheet,ylrqList,5,1  );
-        renderCell(wb,sheet,ylgdList,5,4);
-        renderCell(wb,sheet,glList,5,7);
-        renderCell(wb,sheet,dtList,5,10);
-        renderCell(wb,sheet,dzsbList,5,13);
-        renderCell(wb,sheet,ccList,5,16);
+        renderCell(wb, sheet, ylrqList, 5, 1);
+        renderCell(wb, sheet, ylgdList, 5, 4);
+        renderCell(wb, sheet, glList, 5, 7);
+        renderCell(wb, sheet, dtList, 5, 10);
+        renderCell(wb, sheet, dzsbList, 5, 13);
+        renderCell(wb, sheet, ccList, 5, 16);
     }
 
     private String checkRemarks(String input) {
-        String[] keywords = {"报告未到", "已检等待报告", "等待报告","已检"};
+        String[] keywords = {"报告未到", "已检等待报告", "等待报告", "已检"};
         for (String keyword : keywords) {
             if (input.contains(keyword)) {
                 System.out.println("包含 '" + keyword + "'");
@@ -460,7 +464,8 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         }
         if (approveStatus == 3) {
             return "报废申请中";
-        }if (approveStatus == -1) {
+        }
+        if (approveStatus == -1) {
             return "注销申请中";
         }
         return null;
@@ -569,15 +574,15 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         return max;
     }
 
-    public void renderCell(SXSSFWorkbook wb ,Sheet sheet,List<TSpecReport> list ,int startRow, int startCol ) {
+    public void renderCell(SXSSFWorkbook wb, Sheet sheet, List<TSpecReport> list, int startRow, int startCol) {
         int num = 0;
         Font font = wb.createFont();
         font.setFontHeightInPoints((short) 9); // 设置字体大小为12
         font.setBold(false);
-        for (TSpecReport t: list
-             ) {
+        for (TSpecReport t : list
+        ) {
             //装置
-            logger.info("开始渲染行：" + startRow +"开始渲染列：" + (startCol + num));
+            logger.info("开始渲染行：" + startRow + "开始渲染列：" + (startCol + num));
             Row row = sheet.getRow(startRow + num);
             Cell cell = row.getCell(startCol);
             // 获取单元格样式
@@ -587,7 +592,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             cell.setCellValue(t.getPlantCode());
 
             //数量
-            logger.info("开始渲染行：" + startRow + num +"开始渲染列：" + startCol + 1);
+            logger.info("开始渲染行：" + startRow + num + "开始渲染列：" + startCol + 1);
             Row row2 = sheet.getRow(startRow + num);
             Cell cell2 = row2.getCell(startCol + 1);
             // 获取单元格样式
@@ -597,7 +602,7 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             cell2.setCellValue(t.getDevNum());
 
             //备注
-            logger.info("开始渲染行：" + startRow + num +"开始渲染列：" + startCol + 2 );
+            logger.info("开始渲染行：" + startRow + num + "开始渲染列：" + startCol + 2);
             Row row3 = sheet.getRow(startRow + num);
             Cell cell3 = row3.getCell(startCol + 2);
             // 获取单元格样式
@@ -605,12 +610,14 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             originalStyle.setFont(font);
             cell3.setCellStyle(originalStyle);
             if (t.getRemarks() != null) {
-                cell3.setCellValue(t.getRemarks().replace("-通过","").replace("批准",""));
+                cell3.setCellValue(t.getRemarks().replace("-通过", "").replace("批准", ""));
             }
             num++;
         }
 
-    };
+    }
+
+    ;
 
     /**
      * 修改特种设备报告
@@ -645,41 +652,49 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         return tSpecReportMapper.deleteTSpecReportById(id);
     }
 
-    private String createDetailExcel(TSpecReport tSpecReport) {
+    private String createDetailExcel(TSpecReport tSpecReport, boolean isThree) {
         SXSSFWorkbook wb = new SXSSFWorkbook(1000);
         CellStyle wrapStyle = wb.createCellStyle();
         wrapStyle.setWrapText(true);    //设置自动换行
         //
-        replaceDetailYrlq(wb);
-        replaceDetailYrgd(wb);
-        replaceDetailGl(wb);
-        replaceDetailDt(wb);
-        replaceDetailDzsb(wb);
-        replaceDetailCc(wb);
+        replaceDetailYrlq(wb, isThree);
+        replaceDetailYrgd(wb, isThree);
+        replaceDetailGl(wb, isThree);
+        replaceDetailDt(wb, isThree);
+        replaceDetailDzsb(wb, isThree);
+        replaceDetailCc(wb, isThree);
 
 
         try {
-        String fileDir = RuoYiConfig.getProfile() + "/" + "sems/spec-report-detail";
-        // Save the generated file
-        File dir = new File(fileDir);
-        if (!dir.exists()) {
-            logger.info("目录不存在，创建文件夹{}!", fileDir);
-            dir.mkdirs();
-        }
-        FileOutputStream fos = null;
-        LocalDate currentDate = LocalDate.now();
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
-        String dateStr = currentDate.format(formatter);
-        String filePath = fileDir + "/" + dateStr + "ReportDetail" + tSpecReport.getId() +".xlsx";
+            String fileDir = "";
+            if (isThree) {
+                fileDir = RuoYiConfig.getProfile() + "/" + "sems/spec-report-detail3";
+            } else {
+                fileDir = RuoYiConfig.getProfile() + "/" + "sems/spec-report-detail";
+            }
+            // Save the generated file
+            File dir = new File(fileDir);
+            if (!dir.exists()) {
+                logger.info("目录不存在，创建文件夹{}!", fileDir);
+                dir.mkdirs();
+            }
+            FileOutputStream fos = null;
+            LocalDate currentDate = LocalDate.now();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
+            String dateStr = currentDate.format(formatter);
+            String filePath = fileDir + "/" + dateStr + "ReportDetail" + tSpecReport.getId() + ".xlsx";
+            if (isThree) {
+                filePath = fileDir + "/" + dateStr + "Report3MonthDetail" + tSpecReport.getId() + ".xlsx";
+            }
 
-        fos = new FileOutputStream(filePath);
+            fos = new FileOutputStream(filePath);
 
-        wb.write(fos);
-        //
-        int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
-        String currentDir = StringUtils.substring(filePath, dirLastIndex);
-        String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir ;
-        return pathFileName;
+            wb.write(fos);
+            //
+            int dirLastIndex = RuoYiConfig.getProfile().length() + 1;
+            String currentDir = StringUtils.substring(filePath, dirLastIndex);
+            String pathFileName = Constants.RESOURCE_PREFIX + "/" + currentDir;
+            return pathFileName;
         } catch (FileNotFoundException e) {
             e.printStackTrace();
         } catch (IOException e) {
@@ -688,8 +703,13 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         return "";
     }
 
-    private void replaceDetailYrlq(SXSSFWorkbook wb) {
-        List<TSpecdevYlrq> list = tSpecdevYlrqMapper.selectExpiredYlrq();
+    private void replaceDetailYrlq(SXSSFWorkbook wb, boolean isThree) {
+        List<TSpecdevYlrq> list;
+        if (isThree) {
+             list = tSpecdevYlrqMapper.selectExpiredYlrq(3);
+        }else {
+             list = tSpecdevYlrqMapper.selectExpiredYlrq(0);
+        }
         //创建sheet页
         Sheet sheet = wb.createSheet("压力容器");
         //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
@@ -771,8 +791,14 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             rowIndex++;
         }
     }
-    private void replaceDetailYrgd(SXSSFWorkbook wb) {
-        List<TSpecdevYlgd> list = tSpecdevYlgdMapper.selectExpiredYlgd();
+
+    private void replaceDetailYrgd(SXSSFWorkbook wb, boolean isThree) {
+        List<TSpecdevYlgd> list;
+        if (isThree) {
+            list = tSpecdevYlgdMapper.selectExpiredYlgd(3);
+        }else {
+            list = tSpecdevYlgdMapper.selectExpiredYlgd(0);
+        }
         //创建sheet页
         Sheet sheet = wb.createSheet("压力管道");
         //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
@@ -865,26 +891,32 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         }
 
     }
-    private void replaceDetailGl(SXSSFWorkbook wb) {
-        List<TSpecdevGl> list = tSpecdevGlMapper.selectExpiredGl();
+
+    private void replaceDetailGl(SXSSFWorkbook wb, boolean isThree) {
+        List<TSpecdevGl> list;
+        if (isThree) {
+            list = tSpecdevGlMapper.selectExpiredGl(3);
+        }else {
+            list = tSpecdevGlMapper.selectExpiredGl(0);
+        }
         //创建sheet页
         Sheet sheet = wb.createSheet("锅炉");
         //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
-        sheet.setColumnWidth(0, 12*256);
-        sheet.setColumnWidth(1, 26*256);
-        sheet.setColumnWidth(2, 26*256);
-        sheet.setColumnWidth(3, 26*256);
-        sheet.setColumnWidth(4, 26*256);
-        sheet.setColumnWidth(5, 26*256);
-        sheet.setColumnWidth(6, 26*256);
-        sheet.setColumnWidth(7, 26*256);
-        sheet.setColumnWidth(8, 40*256);
-        sheet.setColumnWidth(9, 40*256);
-        sheet.setColumnWidth(10, 26*256);
-        sheet.setColumnWidth(11, 26*256);
-        sheet.setColumnWidth(12, 40*256);
-        sheet.setColumnWidth(13, 40*256);
-        sheet.setColumnWidth(14, 40*256);
+        sheet.setColumnWidth(0, 12 * 256);
+        sheet.setColumnWidth(1, 26 * 256);
+        sheet.setColumnWidth(2, 26 * 256);
+        sheet.setColumnWidth(3, 26 * 256);
+        sheet.setColumnWidth(4, 26 * 256);
+        sheet.setColumnWidth(5, 26 * 256);
+        sheet.setColumnWidth(6, 26 * 256);
+        sheet.setColumnWidth(7, 26 * 256);
+        sheet.setColumnWidth(8, 40 * 256);
+        sheet.setColumnWidth(9, 40 * 256);
+        sheet.setColumnWidth(10, 26 * 256);
+        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);
@@ -902,23 +934,34 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
         row0.createCell(2).setCellValue("设备位号");
         row0.createCell(3).setCellValue("设备名称");
         row0.createCell(4).setCellValue("使用证号码");
-        row0.createCell(5).setCellValue("检验单位");row0.getCell(5).setCellStyle(style);
-        row0.createCell(6).setCellValue("本次内部检验日期");row0.getCell(6).setCellStyle(style);
-        row0.createCell(7).setCellValue("内部检验结论");row0.getCell(7).setCellStyle(style);
-        row0.createCell(8).setCellValue("内部检验报告编号");row0.getCell(8).setCellStyle(style);
-        row0.createCell(9).setCellValue("下次内部检验日期");row0.getCell(9).setCellStyle(style);
-
-        row0.createCell(10).setCellValue("本次外部检验日期");row0.getCell(10).setCellStyle(style);
-        row0.createCell(11).setCellValue("外部检验结论");row0.getCell(11).setCellStyle(style);
-        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);
+        row0.createCell(5).setCellValue("检验单位");
+        row0.getCell(5).setCellStyle(style);
+        row0.createCell(6).setCellValue("本次内部检验日期");
+        row0.getCell(6).setCellStyle(style);
+        row0.createCell(7).setCellValue("内部检验结论");
+        row0.getCell(7).setCellStyle(style);
+        row0.createCell(8).setCellValue("内部检验报告编号");
+        row0.getCell(8).setCellStyle(style);
+        row0.createCell(9).setCellValue("下次内部检验日期");
+        row0.getCell(9).setCellStyle(style);
+
+        row0.createCell(10).setCellValue("本次外部检验日期");
+        row0.getCell(10).setCellStyle(style);
+        row0.createCell(11).setCellValue("外部检验结论");
+        row0.getCell(11).setCellStyle(style);
+        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;
-        for (TSpecdevGl t: list
+        for (TSpecdevGl t : list
         ) {
             Row row = sheet.createRow(rowIndex);
             row.createCell(0).setCellValue(t.getId());
@@ -927,21 +970,21 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             row.createCell(3).setCellValue(t.getDevname());
             row.createCell(4).setCellValue(t.getUseno());
             row.createCell(5).setCellValue(t.getCheckUnit());
-            if (t.getWarnDate()!= null){
+            if (t.getWarnDate() != null) {
                 row.createCell(6).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getWarnDate()));
             }
 
             row.createCell(7).setCellValue(t.getCheckConclusion());
             row.createCell(8).setCellValue(t.getReportNo());
-            if (t.getNextWarnDate()!= null){
+            if (t.getNextWarnDate() != null) {
                 row.createCell(9).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getNextWarnDate()));
             }
-            if (t.getOutWarnDate()!= null){
+            if (t.getOutWarnDate() != null) {
                 row.createCell(10).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getOutWarnDate()));
             }
             row.createCell(11).setCellValue(t.getOutCheckConclusion());
             row.createCell(12).setCellValue(t.getOutReportNo());
-            if (t.getOutNextWarnDate()!= null){
+            if (t.getOutNextWarnDate() != null) {
                 row.createCell(13).setCellValue(new SimpleDateFormat("yyyy-MM-dd").format(t.getOutNextWarnDate()));
             }
             row.createCell(14).setCellValue(t.getRemarks());
@@ -949,8 +992,14 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             rowIndex++;
         }
     }
-    private void replaceDetailDt(SXSSFWorkbook wb) {
-        List<TSpecdevDt> list = tSpecdevDtMapper.selectExpiredDt();
+
+    private void replaceDetailDt(SXSSFWorkbook wb, boolean isThree) {
+        List<TSpecdevDt> list;
+        if (isThree) {
+            list = tSpecdevDtMapper.selectExpiredDt(3);
+        }else {
+            list = tSpecdevDtMapper.selectExpiredDt(0);
+        }
         //创建sheet页
         Sheet sheet = wb.createSheet("电梯");
         //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
@@ -1021,8 +1070,14 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             rowIndex++;
         }
     }
-    private void replaceDetailDzsb(SXSSFWorkbook wb) {
-        List<TSpecdevDzsb> list = tSpecdevDzsbMapper.selectExpiredDzsb();
+
+    private void replaceDetailDzsb(SXSSFWorkbook wb, boolean isThree) {
+        List<TSpecdevDzsb> list;
+        if (isThree) {
+            list = tSpecdevDzsbMapper.selectExpiredDzsb(3);
+        }else {
+            list = tSpecdevDzsbMapper.selectExpiredDzsb(0);
+        }
         //创建sheet页
         Sheet sheet = wb.createSheet("起重机械");
         //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节
@@ -1092,8 +1147,14 @@ public class TSpecReportServiceImpl implements ITSpecReportService {
             rowIndex++;
         }
     }
-    private void replaceDetailCc(SXSSFWorkbook wb) {
-        List<TSpecdevCc> list = tSpecdevCcMapper.selectExpiredCc();
+
+    private void replaceDetailCc(SXSSFWorkbook wb, boolean isThree) {
+        List<TSpecdevCc> list;
+        if (isThree) {
+            list = tSpecdevCcMapper.selectExpiredCc(3);
+        }else {
+            list = tSpecdevCcMapper.selectExpiredCc(0);
+        }
         //创建sheet页
         Sheet sheet = wb.createSheet("叉车");
         //设置列的宽度，第一个参数为列的序号，从0开始，第二参数为列宽，单位1/256个字节

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

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reportName"    column="report_name"    />
         <result property="reportUrl"    column="report_url"    />
         <result property="detailUrl"    column="detail_url"    />
+        <result property="detail3Url"    column="detail3_url"    />
         <result property="reportType"    column="report_type"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createrCode"    column="creater_code"    />
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectTSpecReportVo">
-        select d.id, d.report_name, d.report_url, d.detail_url, d.report_type, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_spec_report d
+        select d.id, d.report_name, d.report_url, d.detail_url,d.detail3_url, d.report_type, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_spec_report d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -85,37 +86,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectExpriedYlrq3" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code as plantCode, COUNT(*) as devNum
         FROM T_SPECDEV_YLRQ
-        WHERE SYSDATE + INTERVAL '3' MONTH   >  NEXT_WARN_DATE and DEL_FLAG = 0 and STATUS = 1
+        WHERE SYSDATE + INTERVAL '3' MONTH   >  NEXT_WARN_DATE and NEXT_WARN_DATE > SYSDATE and DEL_FLAG = 0 and STATUS = 1
         GROUP BY plant_code
     </select>
     <select id="selectExpriedYlgd3" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code as plantCode, COUNT(*) as devNum
         FROM T_SPECDEV_YLGD
-        WHERE SYSDATE + INTERVAL '3' MONTH   >  NEXT_WARN_DATE and DEL_FLAG = 0 and STATUS = 1
+        WHERE SYSDATE + INTERVAL '3' MONTH   >  NEXT_WARN_DATE and NEXT_WARN_DATE > SYSDATE   and DEL_FLAG = 0 and STATUS = 1
         GROUP BY plant_code
     </select>
     <select id="selectExpriedGl3" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code as plantCode, COUNT(*) as devNum
         FROM T_SPECDEV_GL
-        WHERE SYSDATE+ INTERVAL '3' MONTH   >  NEXT_WARN_DATE and DEL_FLAG = 0 and STATUS = 1
+        WHERE SYSDATE+ INTERVAL '3' MONTH   >  NEXT_WARN_DATE and NEXT_WARN_DATE > SYSDATE  and DEL_FLAG = 0 and STATUS = 1
         GROUP BY plant_code
     </select>
     <select id="selectExpriedDt3" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code as plantCode, COUNT(*) as devNum
         FROM T_SPECDEV_DT
-        WHERE SYSDATE+ INTERVAL '3' MONTH   >  NEXT_WARN_DATE and DEL_FLAG = 0 and STATUS = 1
+        WHERE SYSDATE+ INTERVAL '3' MONTH   >  NEXT_WARN_DATE and NEXT_WARN_DATE > SYSDATE  and DEL_FLAG = 0 and STATUS = 1
         GROUP BY plant_code
     </select>
     <select id="selectExpriedDzsb3" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code as plantCode, COUNT(*) as devNum
         FROM T_SPECDEV_DZSB
-        WHERE SYSDATE+ INTERVAL '3' MONTH   >  NEXT_WARN_DATE and DEL_FLAG = 0 and STATUS = 1
+        WHERE SYSDATE+ INTERVAL '3' MONTH   >  NEXT_WARN_DATE and NEXT_WARN_DATE > SYSDATE  and DEL_FLAG = 0 and STATUS = 1
         GROUP BY plant_code
     </select>
     <select id="selectExpriedCc3" parameterType="TSpecReport" resultMap="TSpecReportResult">
         SELECT plant_code as plantCode, COUNT(*) as devNum
         FROM T_SPECDEV_CC
-        WHERE SYSDATE+ INTERVAL '3' MONTH   >  NEXT_WARN_DATE and DEL_FLAG = 0 and STATUS = 1
+        WHERE SYSDATE+ INTERVAL '3' MONTH   >  NEXT_WARN_DATE and NEXT_WARN_DATE > SYSDATE  and DEL_FLAG = 0 and STATUS = 1
         GROUP BY plant_code
     </select>
 
@@ -172,6 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportName != null">report_name,</if>
             <if test="reportUrl != null">report_url,</if>
             <if test="detailUrl != null">detail_url,</if>
+            <if test="detail3Url != null">detail3_url,</if>
             <if test="reportType != null">report_type,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createrCode != null">creater_code,</if>
@@ -186,6 +188,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportName != null">#{reportName},</if>
             <if test="reportUrl != null">#{reportUrl},</if>
             <if test="detailUrl != null">#{detailUrl},</if>
+            <if test="detail3Url != null">#{detail3Url},</if>
             <if test="reportType != null">#{reportType},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createrCode != null">#{createrCode},</if>
@@ -203,6 +206,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reportName != null">report_name = #{reportName},</if>
             <if test="reportUrl != null">report_url = #{reportUrl},</if>
             <if test="detailUrl != null">detail_url = #{detailUrl},</if>
+            <if test="detail3Url != null">detail3_url = #{detail3Url},</if>
             <if test="reportType != null">report_type = #{reportType},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createrCode != null">creater_code = #{createrCode},</if>

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

@@ -154,7 +154,7 @@
     </select>
 
 
-    <select id="selectExpiredCc" parameterType="TSpecdevCc" resultMap="TSpecdevCcResult">
+    <select id="selectExpiredCc" parameterType="Integer" resultMap="TSpecdevCcResult">
         select d.id,
                d.plant_code,
                d.unit,
@@ -204,9 +204,12 @@
                 ,
                d.is_repeat
         from t_specdev_cc d
-        where SYSDATE > NEXT_WARN_DATE
-          and DEL_FLAG = 0
-          and STATUS = 1
+        <where>
+            <if test="month == 0 ">and SYSDATE > NEXT_WARN_DATE</if>
+            <if test="month == 3 ">and SYSDATE + INTERVAL '3' MONTH   >  NEXT_WARN_DATE and NEXT_WARN_DATE > SYSDATE </if>
+            and DEL_FLAG = 0
+            and STATUS = 1
+        </where>
         order by d.plant_code asc
     </select>
 

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

@@ -97,12 +97,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by d.is_repeat desc, d.plant_code, d.unit ,d.id
     </select>
 
-    <select id="selectExpiredDt" parameterType="TSpecdevDt" resultMap="TSpecdevDtResult">
+    <select id="selectExpiredDt" parameterType="Integer" 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.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
-          and STATUS = 1
+        <where>
+            <if test="month == 0 ">and SYSDATE > NEXT_WARN_DATE</if>
+            <if test="month == 3 ">and SYSDATE + INTERVAL '3' MONTH   >  NEXT_WARN_DATE and NEXT_WARN_DATE > SYSDATE </if>
+            and DEL_FLAG = 0
+            and STATUS = 1
+        </where>
         order by d.plant_code asc
     </select>
 

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

@@ -97,12 +97,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by d.is_repeat desc, d.plant_code, d.unit, d.id
     </select>
 
-    <select id="selectExpiredDzsb" parameterType="TSpecdevDzsb" resultMap="TSpecdevDzsbResult">
+    <select id="selectExpiredDzsb" parameterType="Integer" 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.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
-          and STATUS = 1
+        <where>
+            <if test="month == 0 ">and SYSDATE > NEXT_WARN_DATE</if>
+            <if test="month == 3 ">and SYSDATE + INTERVAL '3' MONTH   >  NEXT_WARN_DATE and NEXT_WARN_DATE > SYSDATE </if>
+            and DEL_FLAG = 0
+            and STATUS = 1
+        </where>
         order by d.plant_code asc
     </select>
 

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

@@ -123,12 +123,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by d.is_repeat desc, d.plant_code, d.unit, d.id
     </select>
 
-    <select id="selectExpiredGl" parameterType="TSpecdevGl" resultMap="TSpecdevGlResult">
+    <select id="selectExpiredGl" parameterType="Integer" 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.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
-          and STATUS = 1
+        <where>
+            <if test="month == 0 ">and SYSDATE > NEXT_WARN_DATE</if>
+            <if test="month == 3 ">and SYSDATE + INTERVAL '3' MONTH   >  NEXT_WARN_DATE and NEXT_WARN_DATE > SYSDATE </if>
+            and DEL_FLAG = 0
+            and STATUS = 1
+        </where>
         order by d.plant_code asc
     </select>
 

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

@@ -205,7 +205,7 @@
         order by d.is_repeat desc, d.plant_code, d.unit, d.id
     </select>
 
-    <select id="selectExpiredYlgd" parameterType="TSpecdevYlgd" resultMap="TSpecdevYlgdResult">
+    <select id="selectExpiredYlgd" parameterType="Integer" resultMap="TSpecdevYlgdResult">
         select d.id,
                d.plant_code,
                d.unit,
@@ -261,9 +261,12 @@
                d.year_next_warn_date,
                d.is_repeat
         from t_specdev_ylgd d
-        where SYSDATE > NEXT_WARN_DATE
+        <where>
+            <if test="month == 0 ">and SYSDATE > NEXT_WARN_DATE</if>
+            <if test="month == 3 ">and SYSDATE + INTERVAL '3' MONTH   >  NEXT_WARN_DATE and NEXT_WARN_DATE > SYSDATE </if>
           and DEL_FLAG = 0
           and STATUS = 1
+        </where>
         order by d.plant_code asc
     </select>
 

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

@@ -169,7 +169,7 @@
         order by d.is_repeat desc, d.plant_code, d.unit, d.id
     </select>
 
-    <select id="selectExpiredYlrq" parameterType="TSpecdevYlrq" resultMap="TSpecdevYlrqResult">
+    <select id="selectExpiredYlrq" parameterType="Integer" resultMap="TSpecdevYlrqResult">
         select d.id,
                d.plant_code,
                d.unit,
@@ -220,9 +220,12 @@
                d.year_report_no,
                d.is_repeat
         from t_specdev_ylrq d
-        where SYSDATE > NEXT_WARN_DATE
-          and DEL_FLAG = 0
-          and STATUS = 1
+        <where>
+            <if test="month == 0 ">and SYSDATE > NEXT_WARN_DATE</if>
+            <if test="month == 3 ">and SYSDATE + INTERVAL '3' MONTH   >  NEXT_WARN_DATE and NEXT_WARN_DATE > SYSDATE </if>
+            and DEL_FLAG = 0
+            and STATUS = 1
+        </where>
         order by d.plant_code asc
     </select>
 

ui/src/views/login.vue

@@ -260,8 +260,8 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  //background-image: url("../assets/image/CPMS20210107.jpg");
-  background-image: url("../assets/image/cpms-test.jpg");
+  background-image: url("../assets/image/CPMS20210107.jpg");
+  //background-image: url("../assets/image/cpms-test.jpg");
   background-size: cover;
 }
 

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

@@ -136,7 +136,7 @@
           <span>{{ parseTime(scope.row.checkDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="isConfirm" :show-overflow-tooltip="true" :formatter="isConfirmFormat"/>
+<!--      <el-table-column label="状态" align="center" prop="isConfirm" :show-overflow-tooltip="true" :formatter="isConfirmFormat"/>-->
       <el-table-column label="安全员" align="center" prop="checkerName" width="120">
         <template slot-scope="scope">
           <span v-if="scope.row.agentId">{{ scope.row.checkerName}} 代 {{ scope.row.agentName}}</span>

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

@@ -118,7 +118,7 @@
           <span v-else>{{ scope.row.checkerName}}</span>
         </template>
       </el-table-column>      <el-table-column label="周" align="center" prop="weekNo" :show-overflow-tooltip="true"/>
-      <el-table-column label="状态" align="center" prop="isConfirm" :show-overflow-tooltip="true" :formatter="isConfirmFormat"/>
+<!--      <el-table-column label="状态" align="center" prop="isConfirm" :show-overflow-tooltip="true" :formatter="isConfirmFormat"/>-->
       <el-table-column label="上周安全风险隐患问题整改核实情况" align="center" prop="lastWeekRisk" :show-overflow-tooltip="true"/>
       <el-table-column label="本周主要安全风险隐患和整改情况" align="center" prop="thisWeekRisk" :show-overflow-tooltip="true"/>
       <el-table-column label="本周安全管理情况评价" align="center" prop="safeCondition" :show-overflow-tooltip="true"/>

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

@@ -142,7 +142,7 @@
           <span>{{ parseTime(scope.row.checkDate, '{y}-{m}-{d}') }}</span>
         </template>
       </u-table-column>
-      <u-table-column label="状态" align="center" prop="isConfirm" :show-overflow-tooltip="true" :formatter="isConfirmFormat"/>
+<!--      <u-table-column label="状态" align="center" prop="isConfirm" :show-overflow-tooltip="true" :formatter="isConfirmFormat"/>-->
 
       <u-table-column label="安全员" align="center" prop="checkerName" width="120">
         <template slot-scope="scope">

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

@@ -123,7 +123,7 @@
           <span v-else>{{ scope.row.checkerName}}</span>
         </template>
       </u-table-column>      <u-table-column label="周" align="center" prop="weekNo" :show-overflow-tooltip="true"/>
-      <u-table-column label="状态" align="center" prop="isConfirm" :show-overflow-tooltip="true" :formatter="isConfirmFormat"/>
+<!--      <u-table-column label="状态" align="center" prop="isConfirm" :show-overflow-tooltip="true" :formatter="isConfirmFormat"/>-->
       <u-table-column label="上周安全风险隐患问题整改核实情况" align="center" prop="lastWeekRisk" :show-overflow-tooltip="true"/>
       <u-table-column label="本周主要安全风险隐患和整改情况" align="center" prop="thisWeekRisk" :show-overflow-tooltip="true"/>
       <u-table-column label="本周安全管理情况评价" align="center" prop="safeCondition" :show-overflow-tooltip="true"/>

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

@@ -96,7 +96,7 @@
         </template>
       </u-table-column>
       <u-table-column label="周" align="center" prop="weekNo" :show-overflow-tooltip="true"/>
-      <u-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true"  :formatter="statusFormat"/>
+<!--      <u-table-column label="状态" align="center" prop="status" :show-overflow-tooltip="true"  :formatter="statusFormat"/>-->
       <u-table-column label="上周安全风险隐患问题整改核实情况" align="center" prop="lastWeekRisk" :show-overflow-tooltip="true"/>
       <u-table-column label="本周主要安全风险隐患和整改情况" align="center" prop="thisWeekRisk" :show-overflow-tooltip="true"/>
       <u-table-column label="本周安全管理情况评价" align="center" prop="safeCondition" :show-overflow-tooltip="true"/>

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

@@ -208,7 +208,7 @@
       <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('备注2')" align="center" prop="remarks2" :render-header="remarksHeader" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140"
                        class-name="small-padding fixed-width">
@@ -1163,7 +1163,32 @@ export default {
         });
         this.loading = false;
       });
-    }
+    },
+    //备注
+    remarksHeader(h, {column, $index}) {
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: (function () {
+                return '如报告未到备注在此处'
+              })(),
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
   }
 };
 </script>

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

@@ -214,7 +214,7 @@
       <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('备注2')" align="center" prop="remarks2" :render-header="remarksHeader" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140"
                        class-name="small-padding fixed-width">
@@ -1097,7 +1097,32 @@ export default {
         });
         this.loading = false;
       });
-    }
+    },
+    //备注
+    remarksHeader(h, {column, $index}) {
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: (function () {
+                return '如报告未到备注在此处'
+              })(),
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
   }
 };
 </script>

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

@@ -214,7 +214,7 @@
       <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('备注2')" align="center" prop="remarks2" :render-header="remarksHeader" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140"
                        class-name="small-padding fixed-width">
@@ -1133,7 +1133,32 @@ export default {
         });
         this.loading = false;
       });
-    }
+    },
+    //备注
+    remarksHeader(h, {column, $index}) {
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: (function () {
+                return '如报告未到备注在此处'
+              })(),
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
   }
 };
 </script>

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

@@ -239,7 +239,7 @@
         </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('备注2')" align="center" prop="remarks2" :render-header="remarksHeader" :show-overflow-tooltip="true"/>
 
       <el-table-column :label="$t('操作')" align="center" fixed="right" width="140"
                        class-name="small-padding fixed-width">
@@ -1222,7 +1222,32 @@ export default {
         });
         this.loading = false;
       });
-    }
+    },
+    //备注
+    remarksHeader(h, {column, $index}) {
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: (function () {
+                return '如报告未到备注在此处'
+              })(),
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
   }
 };
 </script>

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

@@ -40,13 +40,20 @@
           </a>
         </template>
       </el-table-column>
-      <el-table-column label="明细" align="center" prop="detailUrl" :show-overflow-tooltip="true">
+      <el-table-column label="已过期明细" align="center" prop="detailUrl" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <a  class="link-type"  @click="handleDownload(scope.row.detailUrl)">
             <span>{{ getFileName(scope.row.detailUrl) }}</span>
           </a>
         </template>
       </el-table-column>
+      <el-table-column label="3个月到期明细" align="center" prop="detail3Url" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <a  class="link-type"  @click="handleDownload(scope.row.detail3Url)">
+            <span>{{ getFileName(scope.row.detail3Url) }}</span>
+          </a>
+        </template>
+      </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>

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

@@ -308,7 +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('备注2')" align="center" prop="remarks2" :render-header="remarksHeader" :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
@@ -1373,7 +1373,32 @@ export default {
         });
         this.loading = false;
       });
-    }
+    },
+    //备注
+    remarksHeader(h, {column, $index}) {
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: (function () {
+                return '如报告未到备注在此处'
+              })(),
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
   }
 };
 </script>

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

@@ -248,7 +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('备注2')" align="center" prop="remarks2" :render-header="remarksHeader" :show-overflow-tooltip="true"/>
 
 
       <u-table-column :label="$t('操作')" align="center" fixed="right" width="170"
@@ -1310,6 +1310,31 @@ export default {
         )
       ]
     },
+    //备注
+    remarksHeader(h, {column, $index}) {
+      return [
+        column.label,
+        h(
+          "el-tooltip",
+          {
+            props: {
+              content: (function () {
+                return '如报告未到备注在此处'
+              })(),
+              placement: "top"
+            }
+          },
+          [
+            h("span", {
+              class: {
+                "el-icon-question": true,
+                "report-headerTips": true
+              }
+            })
+          ]
+        )
+      ]
+    },
   }
 };
 </script>