pssr 优化

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrMocController.java

@@ -272,7 +272,7 @@ public class TPssrMocController extends BaseController {
             TPssrMoc pssrMoc = new TPssrMoc();
             pssrMoc.setSubId(tPssrMoc.getSubId());
             pssrMoc.setRegion(sysDictDataService.selectDictLabel("MOC_AREA", moc.getArea()));
-            pssrMoc.setMocNo(moc.getCompanyMocNo());
+            pssrMoc.setMocNo(moc.getMocNo());
             pssrMoc.setTitle(moc.getTitle());
             pssrMoc.setDocUpdate(!Objects.isNull(moc.getDocUpdate()) ? "Y" : "N");
             pssrMoc.setTraining(!Objects.isNull(moc.getTraining()) ? "Y" : "N");
@@ -280,7 +280,7 @@ public class TPssrMocController extends BaseController {
             pssrMoc.setCreaterCode(getUserId().toString());
             pssrMoc.setCreatedate(new Date());
             pssrMoc.setApproveStatus(0L);
-            upOrIn(pssrMoc);
+            tPssrMocService.insertTPssrMoc(tPssrMoc);
         }
         return AjaxResult.success();
     }

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulExchangerController.java

@@ -96,14 +96,14 @@ public class TPssrOverhaulExchangerController extends BaseController {
                         .taskAssignee(getUserId().toString())
                         .processInstanceId(approve.getProcessId()).singleResult();
                 if (task != null) {
-                    if (task.getName().equals("确认人")){
+                    if (task.getName().equals("确认人")) {
                         tPssrOverhaulExchanger.setConfirmedPerson(getUserId().toString());
                     }
                 }
             }
         } catch (Exception e) {
             e.printStackTrace();
-            logger.error("待办确认人查询报错：{}",e.getMessage());
+            logger.error("待办确认人查询报错：{}", e.getMessage());
         }
         if ("1".equals(tPssrOverhaulExchanger.getConfirmedPerson())) {
             tPssrOverhaulExchanger.setConfirmedPerson(getUserId().toString());
@@ -111,7 +111,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
         startPage();
         List<TPssrOverhaulExchanger> list = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerList(tPssrOverhaulExchanger);
         list.forEach(item -> {
-            
+
             List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
             item.setFileList(tPssrFiles);
             item.setFileNum((long) tPssrFiles.size());
@@ -140,7 +140,12 @@ public class TPssrOverhaulExchangerController extends BaseController {
         OutputStream out = null;
         String filename = null;
         try {
-            String tempUrl = "static/word/pssr/jxxmhrq.xlsx"; // 模板文件
+            String tempUrl = null; // 模板文件
+            if (devType != 5) {
+                tempUrl = "static/word/pssr/jxxmhrq.xlsx";
+            } else {
+                tempUrl = "static/word/pssr/jxxmqt.xlsx";
+            }
             InputStream is = null;
             is = Thread.currentThread().getContextClassLoader().getResourceAsStream(tempUrl);
             XSSFWorkbook wb = null;
@@ -148,35 +153,35 @@ public class TPssrOverhaulExchangerController extends BaseController {
             XSSFSheet sheet = wb.getSheetAt(0);
             switch (devType.toString()) {
                 case "1":
-                    filename = "PSSR_01_检修项目_换热器"  + ".xlsx";
+                    filename = "PSSR_01_检修项目_换热器" + ".xlsx";
                     sheet.getRow(0).getCell(0).setCellValue("蒸汽裂解装置换热器检修清单");
                     break;
                 case "2":
-                    filename = "PSSR_01_检修项目_电仪"  + ".xlsx";
+                    filename = "PSSR_01_检修项目_电仪" + ".xlsx";
                     sheet.getRow(0).getCell(0).setCellValue("蒸汽裂解装置电仪检修清单");
                     break;
                 case "3":
-                    filename = "PSSR_01_检修项目_反应器"  + ".xlsx";
+                    filename = "PSSR_01_检修项目_反应器" + ".xlsx";
                     sheet.getRow(0).getCell(0).setCellValue("蒸汽裂解装置反应器检修清单");
                     break;
                 case "4":
-                    filename = "PSSR_01_检修项目_裂解炉"  + ".xlsx";
+                    filename = "PSSR_01_检修项目_裂解炉" + ".xlsx";
                     sheet.getRow(0).getCell(0).setCellValue("蒸汽裂解装置裂解炉检修清单");
                     break;
                 case "5":
-                    filename = "PSSR_01_检修项目_其他"  + ".xlsx";
+                    filename = "PSSR_01_检修项目_其他" + ".xlsx";
                     sheet.getRow(0).getCell(0).setCellValue("蒸汽裂解装置其他检修清单");
                     break;
                 case "6":
-                    filename = "PSSR_01_检修项目_动设备"  + ".xlsx";
+                    filename = "PSSR_01_检修项目_动设备" + ".xlsx";
                     sheet.getRow(0).getCell(0).setCellValue("蒸汽裂解装置动设备检修清单");
                     break;
                 case "7":
-                    filename = "PSSR_01_检修项目_安全附件"  + ".xlsx";
+                    filename = "PSSR_01_检修项目_安全附件" + ".xlsx";
                     sheet.getRow(0).getCell(0).setCellValue("蒸汽裂解装置安全附件检修清单");
                     break;
                 case "8":
-                    filename = "PSSR_01_检修项目_管道"  + ".xlsx";
+                    filename = "PSSR_01_检修项目_管道" + ".xlsx";
                     sheet.getRow(0).getCell(0).setCellValue("蒸汽裂解装置管道检修清单");
                     break;
             }
@@ -190,32 +195,61 @@ public class TPssrOverhaulExchangerController extends BaseController {
             // 获取单元格样式
             CellStyle originalStyle = originalcell.getCellStyle();
 
-            for (TPssrOverhaulExchanger t : list) {
-                Row row = sheet.createRow(rowIndex);
-                row.setHeight((short) 800);
-                row.createCell(0).setCellValue(num);
-                row.createCell(1).setCellValue(t.getTagNo());
-                row.createCell(2).setCellValue(t.getEquipmentName());
-                row.createCell(3).setCellValue(t.getPidNo());
-                row.createCell(4).setCellValue(t.getWorkDes());
-                row.createCell(5).setCellValue(t.getCompletionStatus());
-                row.createCell(6);
-                try {
-                    SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirmedPerson()));
-                    String confirm1 = sysUser.getSignUrl();
-                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
-                } catch (Exception e) {
+            if(devType!=5){
+                for (TPssrOverhaulExchanger t : list) {
+                    Row row = sheet.createRow(rowIndex);
+                    row.setHeight((short) 800);
+                    row.createCell(0).setCellValue(num);
+                    row.createCell(1).setCellValue(t.getTagNo());
+                    row.createCell(2).setCellValue(t.getEquipmentName());
+                    row.createCell(3).setCellValue(t.getPidNo());
+                    row.createCell(4).setCellValue(t.getWorkDes());
+                    row.createCell(5).setCellValue(t.getCompletionStatus());
+                    row.createCell(6);
+                    try {
+                        SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirmedPerson()));
+                        String confirm1 = sysUser.getSignUrl();
+                        ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
+                    } catch (Exception e) {
+
+                    }
+                    row.createCell(7).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
+                    row.createCell(8).setCellValue(t.getRemarks());
 
+                    //渲染样式
+                    for (int i = 0; i < 9; i++) {
+                        row.getCell(i).setCellStyle(originalStyle);
+                    }
+                    num++;
+                    rowIndex++;
                 }
-                row.createCell(7).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
-                row.createCell(8).setCellValue(t.getRemarks());
+            }else{
+                for (TPssrOverhaulExchanger t : list) {
+                    Row row = sheet.createRow(rowIndex);
+                    row.setHeight((short) 800);
+                    row.createCell(0).setCellValue(num);
+                    row.createCell(1).setCellValue(t.getEquipmentName());
+                    row.createCell(2).setCellValue(t.getPidNo());
+                    row.createCell(3).setCellValue(t.getWorkDes());
+                    row.createCell(4).setCellValue(t.getCompletionStatus());
+                    row.createCell(5);
+                    try {
+                        SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getConfirmedPerson()));
+                        String confirm1 = sysUser.getSignUrl();
+                        ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 5, 1, 1);
+                    } catch (Exception e) {
+
+                    }
+                    row.createCell(6).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
+                    row.createCell(7).setCellValue(t.getRemarks());
 
-                //渲染样式
-                for (int i = 0; i < 9; i++) {
-                    row.getCell(i).setCellStyle(originalStyle);
+                    //渲染样式
+                    for (int i = 0; i < 8; i++) {
+                        row.getCell(i).setCellStyle(originalStyle);
+                    }
+                    num++;
+                    rowIndex++;
                 }
-                num++;
-                rowIndex++;
             }
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
@@ -234,10 +268,10 @@ public class TPssrOverhaulExchangerController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrOverhaulExchanger item = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerById(id);
-        
-            List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
-            item.setFileList(tPssrFiles);
-            item.setFileNum((long) tPssrFiles.size());
+
+        List<TPssrFile> tPssrFiles = tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort);
+        item.setFileList(tPssrFiles);
+        item.setFileNum((long) tPssrFiles.size());
         if (item.getApproveStatus() != 2)
             item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "jxxm-hrq"));
         return AjaxResult.success(item);
@@ -263,7 +297,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
         if (CollectionUtils.isNotEmpty(list)) {
             item.setId(list.get(0).getId());
             return tPssrOverhaulExchangerService.updateTPssrOverhaulExchanger(item);
-        }else{
+        } else {
             return tPssrOverhaulExchangerService.insertTPssrOverhaulExchanger(item);
         }
     }
@@ -277,7 +311,7 @@ public class TPssrOverhaulExchangerController extends BaseController {
     public AjaxResult edit(@RequestBody TPssrOverhaulExchanger tPssrOverhaulExchanger) {
         TPssrOverhaulExchanger entity = tPssrOverhaulExchangerService.selectTPssrOverhaulExchangerById(tPssrOverhaulExchanger.getId());
         if (entity.getApproveStatus() != 1 && entity.getApproveStatus() != 0) {
-            return  AjaxResult.error("当前状态不可修改！");
+            return AjaxResult.error("当前状态不可修改！");
         }
         tPssrFileService.updateFileRelevance(tPssrOverhaulExchanger.getFileIds(), "jxxm-hrq", tPssrOverhaulExchanger.getId(), tPssrOverhaulExchanger.getSubId());
         return toAjax(tPssrOverhaulExchangerService.updateTPssrOverhaulExchanger(tPssrOverhaulExchanger));
@@ -468,16 +502,28 @@ public class TPssrOverhaulExchangerController extends BaseController {
                     Cell cell = row.getCell(j);
                     String cellValue = ExcelUtils.getCellValue(cell);
                     logger.info("cellValue:" + cellValue);
-                    if (j == 0) {
-                        entity.setTagNo(cellValue);
-                    } else if (j == 1) {
-                        entity.setEquipmentName(cellValue);
-                    } else if (j == 2) {
-                        entity.setWorkDes(cellValue);
-                    } else if (j == 3) {
-                        entity.setPidNo(cellValue);
-                    }else if (j == 4) {
-                        entity.setConfirmedPerson(cellValue);
+                    if(devType!=5){
+                        if (j == 0) {
+                            entity.setTagNo(cellValue);
+                        } else if (j == 1) {
+                            entity.setEquipmentName(cellValue);
+                        } else if (j == 2) {
+                            entity.setWorkDes(cellValue);
+                        } else if (j == 3) {
+                            entity.setPidNo(cellValue);
+                        } else if (j == 4) {
+                            entity.setConfirmedPerson(cellValue);
+                        }
+                    }else{
+                        if (j == 0) {
+                            entity.setEquipmentName(cellValue);
+                        } else if (j == 1) {
+                            entity.setWorkDes(cellValue);
+                        } else if (j == 2) {
+                            entity.setPidNo(cellValue);
+                        } else if (j == 3) {
+                            entity.setConfirmedPerson(cellValue);
+                        }
                     }
                 }
                 entity.setCreaterCode(userId.toString());

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrOverhaulFilterController.java

@@ -120,13 +120,13 @@ public class TPssrOverhaulFilterController extends BaseController {
                         entity.setStrainerLocation(cellValue);
                     } else if (j == 2) {
                         entity.setPidNo(cellValue);
+//                    } else if (j == 3) {
+//                        entity.setIsoDwgNo(cellValue);
                     } else if (j == 3) {
-                        entity.setIsoDwgNo(cellValue);
-                    } else if (j == 4) {
                         entity.setFlangeSize(cellValue);
-                    } else if (j == 5) {
+                    } else if (j == 4) {
                         entity.setChangeClean(cellValue);
-                    }else if (j == 6) {
+                    }else if (j == 5) {
                         entity.setRespPerson(cellValue);
                     }
                 }
@@ -325,23 +325,22 @@ public class TPssrOverhaulFilterController extends BaseController {
                 row.createCell(1).setCellValue(t.getUnit());
                 row.createCell(2).setCellValue(t.getStrainerLocation());
                 row.createCell(3).setCellValue(t.getPidNo());
-                row.createCell(4).setCellValue(t.getIsoDwgNo());
-                row.createCell(5).setCellValue(t.getFlangeSize());
-                row.createCell(6).setCellValue(t.getChangeClean());
-                row.createCell(7).setCellValue(t.getCompletionStatus());
-                row.createCell(8);
+                row.createCell(4).setCellValue(t.getFlangeSize());
+                row.createCell(5).setCellValue(t.getChangeClean());
+                row.createCell(6).setCellValue(t.getCompletionStatus());
+                row.createCell(7);
                 try {
                     SysUser sysUser = sysUserService.selectUserById(Long.valueOf(t.getRespPerson()));
                     String confirm1 = sysUser.getSignUrl();
-                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 9, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 7, 1, 1);
                 } catch (Exception e) {
 
                 }
-                row.createCell(9).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
-                row.createCell(10).setCellValue(t.getRemarks());
+                row.createCell(8).setCellValue(DateUtils.dateTime(t.getCompletionDate()));
+                row.createCell(9).setCellValue(t.getRemarks());
 
                 //渲染样式
-                for (int i = 0; i < 11; i++) {
+                for (int i = 0; i < 10; i++) {
                     row.getCell(i).setCellStyle(originalStyle);
                 }
                 num++;

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrPumpFillController.java

@@ -116,11 +116,11 @@ public class TPssrPumpFillController extends BaseController {
                         entity.setUnit(cellValue);
                     } else if (j == 1) {
                         entity.setDevNo(cellValue);
+//                    } else if (j == 2) {
+//                        entity.setLubricatingPart(cellValue);
                     } else if (j == 2) {
-                        entity.setLubricatingPart(cellValue);
-                    } else if (j == 3) {
                         entity.setConfirmer1(cellValue);
-                    } else if (j == 4) {
+                    } else if (j == 3) {
                         entity.setConfirmer2(cellValue);
                     }
                 }
@@ -235,27 +235,27 @@ public class TPssrPumpFillController extends BaseController {
                 row.createCell(0).setCellValue(num);
                 row.createCell(1).setCellValue(t.getUnit());
                 row.createCell(2).setCellValue(t.getDevNo());
-                row.createCell(3).setCellValue(t.getLubricatingPart());
-                row.createCell(4).setCellValue(t.getFillingComplete());
-                row.createCell(5).setCellValue(t.getLubricatingLeak());
-                row.createCell(6).setCellValue(t.getLiquidNormal());
+//                row.createCell(3).setCellValue(t.getLubricatingPart());
+                row.createCell(3).setCellValue(t.getFillingComplete());
+                row.createCell(4).setCellValue(t.getLubricatingLeak());
+                row.createCell(5).setCellValue(t.getLiquidNormal());
+                row.createCell(6);
                 row.createCell(7);
-                row.createCell(8);
                 try {
                     SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer2()));
                     String confirm1 =  sysUser1.getSignUrl();
                     String confirm2 =  sysUser2.getSignUrl();
-                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 7, 1, 1);
-                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 8, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 6, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 7, 1, 1);
                 } catch (Exception e) {
 
                 }
-                row.createCell(9).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
-                row.createCell(10).setCellValue(t.getRemarks());
+                row.createCell(8).setCellValue(DateUtils.dateTime(t.getConfirmationDate()));
+                row.createCell(9).setCellValue(t.getRemarks());
 
                 //渲染样式
-                for (int i = 0; i < 11; i++) {
+                for (int i = 0; i < 10; i++) {
                     row.getCell(i).setCellStyle(originalStyle);
                 }
                 num++;

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBleedController.java

@@ -116,11 +116,11 @@ public class TPssrSafetyBleedController extends BaseController {
                         entity.setDevNo(cellValue);
                     } else if (j == 3) {
                         entity.setInstallLocation(cellValue);
+//                    } else if (j == 4) {
+//                        entity.setSetPressure(cellValue);
                     } else if (j == 4) {
-                        entity.setSetPressure(cellValue);
-                    } else if (j == 5) {
                         entity.setConfirmer1(cellValue);
-                    } else if (j == 6) {
+                    } else if (j == 5) {
                         entity.setConfirmer2(cellValue);
                     }
                 }
@@ -240,25 +240,25 @@ public class TPssrSafetyBleedController extends BaseController {
                 row.createCell(6).setCellValue(t.getInstallLocation());
                 row.createCell(7).setCellValue(t.getInstallAccuracy());
                 row.createCell(8).setCellValue(t.getPutUse());
-                row.createCell(9).setCellValue(t.getSetPressure());
-                row.createCell(10).setCellValue(t.getUniformPressure());
-                row.createCell(11);
-                row.createCell(12);
+//                row.createCell(9).setCellValue(t.getSetPressure());
+//                row.createCell(10).setCellValue(t.getUniformPressure());
+                row.createCell(9);
+                row.createCell(10);
                 try {
                     SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer2()));
                     String confirm1 = sysUser1.getSignUrl();
                     String confirm2 = sysUser2.getSignUrl();
-                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 11, 1, 1);
-                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 12, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 9, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 10, 1, 1);
                 } catch (Exception e) {
 
                 }
-                row.createCell(13).setCellValue(DateUtils.dateTime(t.getConfirmationTime()));
-                row.createCell(14).setCellValue(t.getRemarks());
+                row.createCell(11).setCellValue(DateUtils.dateTime(t.getConfirmationTime()));
+                row.createCell(12).setCellValue(t.getRemarks());
 
                 //渲染样式
-                for (int i = 0; i < 15; i++) {
+                for (int i = 0; i < 13; i++) {
                     row.getCell(i).setCellStyle(originalStyle);
                 }
                 num++;

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyBrustController.java

@@ -111,15 +111,15 @@ public class TPssrSafetyBrustController extends BaseController {
                         entity.setUnit(cellValue);
                     } else if (j == 1) {
                         entity.setDevNo(cellValue);
+//                    } else if (j == 2) {
+//                        entity.setSafetyDev(cellValue);
                     } else if (j == 2) {
-                        entity.setSafetyDev(cellValue);
-                    } else if (j == 3) {
                         entity.setInstallLocation(cellValue);
-                    } else if (j == 4) {
+                    } else if (j == 3) {
                         entity.setSetPressure(cellValue);
-                    } else if (j == 5) {
+                    } else if (j == 4) {
                         entity.setConfirmer1(cellValue);
-                    } else if (j == 6) {
+                    } else if (j == 5) {
                         entity.setConfirmer2(cellValue);
                     }
                 }
@@ -233,31 +233,31 @@ public class TPssrSafetyBrustController extends BaseController {
                 row.createCell(0).setCellValue(num);
                 row.createCell(1).setCellValue(t.getUnit());
                 row.createCell(2).setCellValue(t.getDevNo());
-                row.createCell(3).setCellValue(t.getSafetyDev());
-                row.createCell(4).setCellValue(t.getInstallLocation());
-                row.createCell(5).setCellValue(t.getInstallAccuracy());
-                row.createCell(6).setCellValue(t.getRightDirection());
-                row.createCell(7).setCellValue(t.getPutUse());
-                row.createCell(8).setCellValue(t.getSetPressure());
-                row.createCell(9).setCellValue(t.getUniformPressure());
-                row.createCell(10).setCellValue(t.getIs0kpa());
+//                row.createCell(3).setCellValue(t.getSafetyDev());
+                row.createCell(3).setCellValue(t.getInstallLocation());
+                row.createCell(4).setCellValue(t.getInstallAccuracy());
+                row.createCell(5).setCellValue(t.getRightDirection());
+                row.createCell(6).setCellValue(t.getPutUse());
+                row.createCell(7).setCellValue(t.getSetPressure());
+                row.createCell(8).setCellValue(t.getUniformPressure());
+                row.createCell(9).setCellValue(t.getIs0kpa());
+                row.createCell(10);
                 row.createCell(11);
-                row.createCell(12);
                 try {
                     SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer2()));
                     String confirm1 = sysUser1.getSignUrl();
                     String confirm2 = sysUser2.getSignUrl();
-                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 11, 1, 1);
-                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 12, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 10, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 11, 1, 1);
                 } catch (Exception e) {
 
                 }
-                row.createCell(13).setCellValue(DateUtils.dateTime(t.getConfirmationTime()));
-                row.createCell(14).setCellValue(t.getRemarks());
+                row.createCell(12).setCellValue(DateUtils.dateTime(t.getConfirmationTime()));
+                row.createCell(13).setCellValue(t.getRemarks());
 
                 //渲染样式
-                for (int i = 0; i < 15; i++) {
+                for (int i = 0; i < 14; i++) {
                     row.getCell(i).setCellStyle(originalStyle);
                 }
                 num++;

master/src/main/java/com/ruoyi/project/pssr/controller/TPssrSafetyValveController.java

@@ -173,31 +173,31 @@ public class TPssrSafetyValveController extends BaseController {
                 row.createCell(1).setCellValue(t.getUnit());
                 row.createCell(2).setCellValue(t.getPidNo());
                 row.createCell(3).setCellValue(t.getDevNo());
-                row.createCell(4).setCellValue(t.getSafetyDev());
-                row.createCell(5).setCellValue(t.getVerify());
-                row.createCell(6).setCellValue(t.getInValidity());
-                row.createCell(7).setCellValue(t.getInstallLocation());
-                row.createCell(8).setCellValue(t.getInstallAccuracy());
-                row.createCell(9).setCellValue(t.getPutUse());
-                row.createCell(10).setCellValue(t.getSetPressure());
-                row.createCell(11).setCellValue(t.getUniformPressure());
+//                row.createCell(4).setCellValue(t.getSafetyDev());
+                row.createCell(4).setCellValue(t.getVerify());
+                row.createCell(5).setCellValue(t.getInValidity());
+                row.createCell(6).setCellValue(t.getInstallLocation());
+                row.createCell(7).setCellValue(t.getInstallAccuracy());
+                row.createCell(8).setCellValue(t.getPutUse());
+                row.createCell(9).setCellValue(t.getSetPressure());
+                row.createCell(10).setCellValue(t.getUniformPressure());
+                row.createCell(11);
                 row.createCell(12);
-                row.createCell(13);
                 try {
                     SysUser sysUser1 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer1()));
                     SysUser sysUser2 = sysUserService.selectUserById(Long.valueOf(t.getConfirmer2()));
                     String confirm1 = sysUser1.getSignUrl();
                     String confirm2 = sysUser2.getSignUrl();
-                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 12, 1, 1);
-                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 13, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm1, row.getRowNum(), 11, 1, 1);
+                    ExcelUtils.insertPicture(wb, sheet, confirm2, row.getRowNum(), 12, 1, 1);
                 } catch (Exception e) {
 
                 }
-                row.createCell(14).setCellValue(DateUtils.dateTime(t.getConfirmationTime()));
-                row.createCell(15).setCellValue(t.getRemarks());
+                row.createCell(13).setCellValue(DateUtils.dateTime(t.getConfirmationTime()));
+                row.createCell(14).setCellValue(t.getRemarks());
 
                 //渲染样式
-                for (int i = 0; i < 16; i++) {
+                for (int i = 0; i < 15; i++) {
                     row.getCell(i).setCellStyle(originalStyle);
                 }
                 num++;

master/src/main/resources/mybatis/pssr/TPssrAirtightMapper.xml

@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
         WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
         ELSE 2
-        END,id desc
+        END,updatedate,id desc
     </select>
 
     <select id="selectTPssrAirtightById" parameterType="Long" resultMap="TPssrAirtightResult">

master/src/main/resources/mybatis/pssr/TPssrBlindMapper.xml

@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="pidNo != null  and pidNo != ''"> and pid_no = #{pidNo}</if>
             <if test="pipelineNo != null  and pipelineNo != ''"> and pipeline_no = #{pipelineNo}</if>
             <if test="medium != null  and medium != ''"> and medium = #{medium}</if>
-            <if test="blindNo != null  and blindNo != ''"> and blind_no = #{blindNo}</if>
+            <if test="blindNo != null  and blindNo != ''"> and blind_no like concat('%',concat(#{blindNo},'%'))</if>
             <if test="location != null  and location != ''"> and location = #{location}</if>
             <if test="isoType != null  and isoType != ''"> and iso_type = #{isoType}</if>
             <if test="tagNo != null  and tagNo != ''"> and tag_no = #{tagNo}</if>

master/src/main/resources/mybatis/reliability/TSafetyvavleMapper.xml

@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTSafetyvavleList" parameterType="TSafetyvavle" resultMap="TSafetyvavleResult">
         <include refid="selectTSafetyvavleVo"/>
         <where>  
-            <if test="tagno != null  and tagno != ''"> and tagno = #{tagno}</if>
+            <if test="tagno != null  and tagno != ''"> and tagno like concat('%',concat(#{tagno},'%'))</if>
             <if test="item != null "> and item = #{item}</if>
             <if test="subarea != null "> and subarea = #{subarea}</if>
             and d.del_flag = 0