PSSR确认人不能相同校验

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

@@ -210,6 +210,9 @@ public class TPssrAirtightController extends BaseController {
     @Log(title = "气密", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrAirtight tPssrAirtight) {
+        if (tPssrAirtight.getConfirm1().equals(tPssrAirtight.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrAirtight.setApproveStatus(0L);
         try {
             String initialPressure = tPssrAirtight.getInitialPressure();//初始压力

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

@@ -259,6 +259,9 @@ public class TPssrAnalyzerController extends BaseController {
     @Log(title = "在线分析仪", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrAnalyzer tPssrAnalyzer) {
+        if (tPssrAnalyzer.getConfirm1().equals(tPssrAnalyzer.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrAnalyzer.setApproveStatus(0L);
         return toAjax(tPssrAnalyzerService.insertTPssrAnalyzer(tPssrAnalyzer));
     }

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

@@ -285,6 +285,9 @@ public class TPssrBlindController extends BaseController {
     @Log(title = "盲板", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrBlind tPssrBlind) {
+        if (tPssrBlind.getInConfirm1().equals(tPssrBlind.getInConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrBlind.setApproveStatus(0L);
         return toAjax(tPssrBlindService.insertTPssrBlind(tPssrBlind));
     }

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

@@ -280,6 +280,9 @@ public class TPssrCircuitController extends BaseController {
     @Log(title = "短接", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrCircuit tPssrCircuit) {
+        if (tPssrCircuit.getConfirm1().equals(tPssrCircuit.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrCircuit.setApproveStatus(0L);
         return toAjax(tPssrCircuitService.insertTPssrCircuit(tPssrCircuit));
     }

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

@@ -13,6 +13,7 @@ import com.ruoyi.project.pssr.domain.TPssrApprove;
 import com.ruoyi.project.pssr.domain.TPssrCleaning;
 import com.ruoyi.project.pssr.domain.TPssrSubcontent;
 import com.ruoyi.project.pssr.domain.TPssrTurndown;
+import com.ruoyi.project.pssr.domain.vo.TPssrCleaningVo;
 import com.ruoyi.project.pssr.mapper.TPssrCleaningMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -79,12 +80,11 @@ public class TPssrCleaningController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('pssr:cleaning:add')")
     @PostMapping("/importData")
-    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException
-    {
+    public AjaxResult importInterlockData(MultipartFile file, Long subId) throws IOException {
         //获取操作人员ID
         Long userId = getUserId();
         //报错行数统计
-        List<Integer> failRow =new ArrayList<Integer>();
+        List<Integer> failRow = new ArrayList<Integer>();
         Workbook workbook = ExcelUtils.getWorkBook(file);
         Sheet sheet = workbook.getSheetAt(0);
         List<TPssrCleaning> list = new ArrayList<TPssrCleaning>();
@@ -108,11 +108,11 @@ public class TPssrCleaningController extends BaseController {
                     logger.info("cellValue:" + cellValue);
                     if (j == 0) {
                         entity.setUnit(cellValue);
-                    }else if (j == 1) {
+                    } else if (j == 1) {
                         entity.setDevNo(cellValue);
-                    }else if (j == 2) {
+                    } else if (j == 2) {
                         entity.setSerialNumber(Long.parseLong(cellValue));
-                    }else if (j == 3) {
+                    } else if (j == 3) {
                         entity.setCheckContent(cellValue);
                     } else if (j == 4) {
                         entity.setCheckResult(cellValue);
@@ -127,9 +127,9 @@ public class TPssrCleaningController extends BaseController {
                 entity.setCreaterCode(userId.toString());
                 logger.info("entity:" + entity);
                 list.add(entity);
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
-                failRow.add(i+1);
+                failRow.add(i + 1);
             }
         }
         int successNumber = 0;
@@ -140,16 +140,16 @@ public class TPssrCleaningController extends BaseController {
             try {
                 tPssrCleaningService.insertTPssrCleaning(t);
                 successNumber++;
-            }catch (Exception e){
+            } catch (Exception e) {
                 failNumber++;
                 logger.info("e:" + e);
-                failRow.add(failNum+1);
+                failRow.add(failNum + 1);
             }
         }
         logger.info("list:" + JSON.toJSONString(list));
-        logger.info("successNumber:" +String.valueOf(successNumber));
-        logger.info("failNumber:" +String.valueOf(failNumber));
-        logger.info("failRow:" +String.valueOf(failRow));
+        logger.info("successNumber:" + String.valueOf(successNumber));
+        logger.info("failNumber:" + String.valueOf(failNumber));
+        logger.info("failRow:" + String.valueOf(failRow));
         return AjaxResult.success("导入成功行数：" + String.valueOf(successNumber));
     }
 
@@ -163,6 +163,7 @@ public class TPssrCleaningController extends BaseController {
         List<TPssrCleaning> list = tPssrCleaningService.selectTPssrCleaningList(tPssrCleaning);
         list.forEach(item -> {
             item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sbqjd"));
+            item.setContentList(JSON.parseArray(item.getCheckContent(), TPssrCleaningVo.class));
             if (item.getApproveStatus() != 2)
                 item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "sbqjd"));
         });
@@ -232,7 +233,7 @@ public class TPssrCleaningController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_07_设备清洁_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_07_设备清洁_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();
@@ -250,9 +251,10 @@ public class TPssrCleaningController extends BaseController {
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrCleaning item = tPssrCleaningService.selectTPssrCleaningById(id);
+        item.setContentList(JSON.parseArray(item.getCheckContent(), TPssrCleaningVo.class));
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), "sbqjd"));
-            if (item.getApproveStatus() != 2)
-                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "sbqjd"));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), "sbqjd"));
         return AjaxResult.success(item);
     }
 
@@ -263,10 +265,68 @@ public class TPssrCleaningController extends BaseController {
     @Log(title = "设备清洁", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrCleaning tPssrCleaning) {
+        if (tPssrCleaning.getConfirm1().equals(tPssrCleaning.getConfirm2())) {
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
+        tPssrCleaning.setCheckContent(JSON.toJSONString(genList(tPssrCleaning.getDevType())));
         tPssrCleaning.setApproveStatus(0L);
         return toAjax(tPssrCleaningService.insertTPssrCleaning(tPssrCleaning));
     }
 
+    private List<TPssrCleaningVo> genList(String devType) {
+        List<TPssrCleaningVo> list = new ArrayList<>();
+        switch (devType) {
+            case "开工锅炉":
+                list.add(new TPssrCleaningVo(1, "炉膛内壁衬里完整，无脱落。", "✔"));
+                list.add(new TPssrCleaningVo(2, "炉膛内烧嘴清洁干净，无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(3, "炉膛内炉管外壁清洁干净，无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(4, "水包清洁干净，无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(5, "汽包清洁干净,无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(6, "省煤器清洁干净,无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(7, "通风道清洁干净,无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(8, "烟道清洁干净,无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(9, "炉膛内部无遗留其他不相关的物件。", "✔"));
+                break;
+            case "裂解炉":
+                list.add(new TPssrCleaningVo(1, "炉膛内壁衬里完整，无脱落。", "✔"));
+                list.add(new TPssrCleaningVo(2, "炉膛内炉管外壁清洁干净，无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(3, "炉膛内烧嘴清洁干净，无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(4, "炉膛内部管口清洁干净,无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(5, "炉膛内部无遗留其他不相关的物件。", "✔"));
+                break;
+            case "塔":
+                list.add(new TPssrCleaningVo(1, "塔内壁清洁干净，无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(2, "塔板清洁干净，无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(3, "降液槽清洁干净，无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(4, "塔内部管口清洁干净,无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(5, "塔内部无遗留其他不相关的物件。", "✔"));
+                break;
+            case "罐":
+                list.add(new TPssrCleaningVo(1, "罐内壁清洁干净，无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(2, "罐内部管口清洁干净,无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(3, "罐内部无遗留其他不相关的物件。", "✔"));
+                break;
+            case "反应器":
+            case "干燥器":
+                list.add(new TPssrCleaningVo(1, "器内壁清洁干净，无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(2, "器内部管口清洁干净,无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(3, "器内部无遗留其他不相关的物件。", "✔"));
+                break;
+            case "换热器":
+                list.add(new TPssrCleaningVo(1, "管束内壁清洁干净，无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(2, "管箱内部清洁干净,无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(3, "管束外壁清洁干净，无残留物", "✔"));
+                list.add(new TPssrCleaningVo(4, "筒体内壁清洁干净，无残留物", "✔"));
+                break;
+            case "冷箱":
+                list.add(new TPssrCleaningVo(1, "箱内壁清洁干净，无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(2, "箱内部管口清洁干净,无残留物。", "✔"));
+                list.add(new TPssrCleaningVo(3, "箱内部无遗留其他不相关的物件。", "✔"));
+                break;
+        }
+        return list;
+    }
+
     /**
      * 修改设备清洁
      */
@@ -274,9 +334,10 @@ public class TPssrCleaningController extends BaseController {
     @Log(title = "设备清洁", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrCleaning tPssrCleaning) {
-        if (tPssrCleaning.getConfirm1().equals(tPssrCleaning.getConfirm2())){
+        if (tPssrCleaning.getConfirm1().equals(tPssrCleaning.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
+        tPssrCleaning.setCheckContent(JSON.toJSONString(tPssrCleaning.getContentList()));
         tPssrFileService.updateFileRelevance(tPssrCleaning.getFileIds(), "sbqjd", tPssrCleaning.getId(), tPssrCleaning.getSubId());
         return toAjax(tPssrCleaningService.updateTPssrCleaning(tPssrCleaning));
     }
@@ -288,7 +349,7 @@ public class TPssrCleaningController extends BaseController {
     @Log(title = "设备清洁", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrCleaning tPssrCleaning) {
-        if (tPssrCleaning.getConfirm1().equals(tPssrCleaning.getConfirm2())){
+        if (tPssrCleaning.getConfirm1().equals(tPssrCleaning.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         return toAjax(tPssrCleaningMapper.updateTPssrCleaningByIds(tPssrCleaning));

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

@@ -269,6 +269,9 @@ public class TPssrFrameController extends BaseController {
     @Log(title = "支（吊）架", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrFrame tPssrFrame) {
+        if (tPssrFrame.getConfirm1().equals(tPssrFrame.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFrame.setApproveStatus(0L);
         return toAjax(tPssrFrameService.insertTPssrFrame(tPssrFrame));
     }

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

@@ -251,6 +251,9 @@ public class TPssrFranklinismController extends BaseController {
     @Log(title = "静电接地，跨接", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrFranklinism tPssrFranklinism) {
+        if (tPssrFranklinism.getConfirm1().equals(tPssrFranklinism.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFranklinism.setApproveStatus(0L);
         return toAjax(tPssrFranklinismService.insertTPssrFranklinism(tPssrFranklinism));
     }

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

@@ -257,6 +257,9 @@ public class TPssrGasdetectorController extends BaseController {
     @Log(title = "气体检测器", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrGasdetector tPssrGasdetector) {
+        if (tPssrGasdetector.getConfirm1().equals(tPssrGasdetector.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrGasdetector.setApproveStatus(0L);
         return toAjax(tPssrGasdetectorService.insertTPssrGasdetector(tPssrGasdetector));
     }

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

@@ -260,6 +260,9 @@ public class TPssrInstrumentCalibrationController extends BaseController {
     @Log(title = "仪表校验", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration) {
+        if (tPssrInstrumentCalibration.getConfirm1().equals(tPssrInstrumentCalibration.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrInstrumentCalibration.setApproveStatus(0L);
         return toAjax(tPssrInstrumentCalibrationService.insertTPssrInstrumentCalibration(tPssrInstrumentCalibration));
     }

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

@@ -180,6 +180,9 @@ public class TPssrLightingController extends BaseController {
     @Log(title = "照明", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrLighting tPssrLighting) {
+        if (tPssrLighting.getConfirm1().equals(tPssrLighting.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrLighting.setApproveStatus(0L);
         return toAjax(tPssrLightingService.insertTPssrLighting(tPssrLighting));
     }

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

@@ -287,6 +287,9 @@ public class TPssrMaterialController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrMaterial tPssrMaterial) {
+        if (tPssrMaterial.getConfirm1().equals(tPssrMaterial.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrMaterialService.insertTPssrMaterial(tPssrMaterial));
     }
 

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

@@ -106,6 +106,9 @@ public class TPssrMaterialRawController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrMaterialRaw tPssrMaterialRaw) {
+        if (tPssrMaterialRaw.getConfirm1().equals(tPssrMaterialRaw.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrMaterialRawService.insertTPssrMaterialRaw(tPssrMaterialRaw));
     }
 

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

@@ -272,6 +272,9 @@ public class TPssrMeasureController extends BaseController {
     @Log(title = "人身防护", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrMeasure tPssrMeasure) {
+        if (tPssrMeasure.getConfirm1().equals(tPssrMeasure.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrMeasure.setApproveStatus(0L);
         tPssrMeasure.setCreaterCode(String.valueOf(getUserId()));
         tPssrMeasure.setCreatedate(new Date());

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

@@ -188,6 +188,9 @@ public class TPssrMocController extends BaseController {
     @Log(title = "MOC完成确认清单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrMoc tPssrMoc) {
+        if (tPssrMoc.getConfirm1().equals(tPssrMoc.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrMocService.insertTPssrMoc(tPssrMoc));
     }
 

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

@@ -258,6 +258,9 @@ public class TPssrMotorController extends BaseController {
     @Log(title = "电机设备", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrMotor tPssrMotor) {
+        if (tPssrMotor.getConfirm1().equals(tPssrMotor.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrMotor.setApproveStatus(0L);
         return toAjax(tPssrMotorService.insertTPssrMotor(tPssrMotor));
     }

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

@@ -271,6 +271,9 @@ public class TPssrNitrogenController extends BaseController {
     @Log(title = "系统氮气置换", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrNitrogen tPssrNitrogen) {
+        if (tPssrNitrogen.getConfirm1().equals(tPssrNitrogen.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrNitrogen.setApproveStatus(0L);
         this.verifySatndard(tPssrNitrogen);
         return toAjax(tPssrNitrogenService.insertTPssrNitrogen(tPssrNitrogen));

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

@@ -228,7 +228,9 @@ public class TPssrPipeController extends BaseController {
     @Log(title = "管道", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrPipe tPssrPipe) {
-
+        if (tPssrPipe.getConfirmer1().equals(tPssrPipe.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrPipe.setApproveStatus(0L);
         tPssrPipe.setCreatedate(new Date());
         tPssrPipe.setCreaterCode(getUserId().toString());

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

@@ -174,6 +174,9 @@ public class TPssrPowerController extends BaseController {
     @Log(title = "临时电源", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrPower tPssrPower) {
+        if (tPssrPower.getConfirm1().equals(tPssrPower.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrPower.setApproveStatus(0L);
         return toAjax(tPssrPowerService.insertTPssrPower(tPssrPower));
     }

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

@@ -170,6 +170,9 @@ public class TPssrProgrammeController extends BaseController {
     @Log(title = "开工方案", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrProgramme tPssrProgramme) {
+        if (tPssrProgramme.getConfirm1().equals(tPssrProgramme.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrProgrammeService.insertTPssrProgramme(tPssrProgramme));
     }
 
@@ -181,6 +184,9 @@ public class TPssrProgrammeController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrProgramme tPssrProgramme)
     {
+        if (tPssrProgramme.getConfirm1().equals(tPssrProgramme.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrProgrammeService.updateTPssrProgramme(tPssrProgramme));
     }
 
@@ -192,6 +198,9 @@ public class TPssrProgrammeController extends BaseController {
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrProgramme tPssrProgramme)
     {
+        if (tPssrProgramme.getConfirm1().equals(tPssrProgramme.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrProgrammeMapper.updateTPssrProgrammeByIds(tPssrProgramme));
     }
 

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

@@ -262,6 +262,9 @@ public class TPssrProtectionController extends BaseController {
     @Log(title = "人身防护", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrProtection tPssrProtection) {
+        if (tPssrProtection.getConfirm1().equals(tPssrProtection.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrProtection.setApproveStatus(0L);
         tPssrProtection.setCreaterCode(String.valueOf(getUserId()));
         tPssrProtection.setCreatedate(new Date());

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

@@ -168,6 +168,9 @@ public class TPssrPublicController extends BaseController {
     @Log(title = "公用工程", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrPublic tPssrPublic) {
+        if (tPssrPublic.getConfirm1().equals(tPssrPublic.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrPublic.setApproveStatus(0L);
         return toAjax(tPssrPublicService.insertTPssrPublic(tPssrPublic));
     }

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

@@ -272,6 +272,9 @@ public class TPssrPumpCleaningController extends BaseController {
     @Log(title = "机泵过滤器清理工作清单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrPumpCleaning tPssrPumpCleaning) {
+        if (tPssrPumpCleaning.getConfirmer1().equals(tPssrPumpCleaning.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrPumpCleaning.setApproveStatus(0L);
         tPssrPumpCleaning.setCreatedate(new Date());
         tPssrPumpCleaning.setCreaterCode(String.valueOf(getUserId()));

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

@@ -275,6 +275,9 @@ public class TPssrPumpFillController extends BaseController {
     @Log(title = "机泵润滑油加注确认清单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrPumpFill tPssrPumpFill) {
+        if (tPssrPumpFill.getConfirmer1().equals(tPssrPumpFill.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrPumpFill.setApproveStatus(0L);
         tPssrPumpFill.setCreatedate(new Date());
         tPssrPumpFill.setCreaterCode(String.valueOf(getUserId()));

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

@@ -269,6 +269,9 @@ public class TPssrPumpOverhaulController extends BaseController {
     @Log(title = "机泵检修完成确认清单", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrPumpOverhaul tPssrPumpOverhaul) {
+        if (tPssrPumpOverhaul.getConfirmer1().equals(tPssrPumpOverhaul.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrPumpOverhaul.setApproveStatus(0L);
         tPssrPumpOverhaul.setCreatedate(new Date());
         tPssrPumpOverhaul.setCreaterCode(String.valueOf(getUserId()));

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

@@ -268,6 +268,9 @@ public class TPssrSafetyBleedController extends BaseController {
     @Log(title = "安全设施-紧急泄放阀", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrSafetyBleed tPssrSafetyBleed) {
+        if (tPssrSafetyBleed.getConfirmer1().equals(tPssrSafetyBleed.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrSafetyBleed.setApproveStatus(0L);
         return toAjax(tPssrSafetyBleedService.insertTPssrSafetyBleed(tPssrSafetyBleed));
     }

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

@@ -268,6 +268,9 @@ public class TPssrSafetyBreathController extends BaseController {
     @Log(title = "安全设施-呼吸阀", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrSafetyBreath tPssrSafetyBreath) {
+        if (tPssrSafetyBreath.getConfirmer1().equals(tPssrSafetyBreath.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrSafetyBreath.setApproveStatus(0L);
         return toAjax(tPssrSafetyBreathService.insertTPssrSafetyBreath(tPssrSafetyBreath));
     }

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

@@ -268,6 +268,9 @@ public class TPssrSafetyBrustController extends BaseController {
     @Log(title = "安全设施-爆破片", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrSafetyBrust tPssrSafetyBrust) {
+        if (tPssrSafetyBrust.getConfirmer1().equals(tPssrSafetyBrust.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrSafetyBrust.setApproveStatus(0L);
         return toAjax(tPssrSafetyBrustService.insertTPssrSafetyBrust(tPssrSafetyBrust));
     }

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

@@ -256,6 +256,9 @@ public class TPssrSafetyFlamearresterController extends BaseController {
     @Log(title = "安全设施-阻火器", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrSafetyFlamearrester tPssrSafetyFlamearrester) {
+        if (tPssrSafetyFlamearrester.getConfirmer1().equals(tPssrSafetyFlamearrester.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrSafetyFlamearrester.setApproveStatus(0L);
         return toAjax(tPssrSafetyFlamearresterService.insertTPssrSafetyFlamearrester(tPssrSafetyFlamearrester));
     }

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

@@ -170,6 +170,9 @@ public class TPssrSafetyValveController extends BaseController {
     @Log(title = "安全设施-安全阀", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrSafetyValve tPssrSafetyValve) {
+        if (tPssrSafetyValve.getConfirmer1().equals(tPssrSafetyValve.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrSafetyValve.setApproveStatus(0L);
         return toAjax(tPssrSafetyValveService.insertTPssrSafetyValve(tPssrSafetyValve));
     }

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

@@ -182,6 +182,9 @@ public class TPssrTorchvocController extends BaseController {
     @Log(title = "火炬，VOC系统", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrTorchvoc tPssrTorchvoc) {
+        if (tPssrTorchvoc.getConfirm1().equals(tPssrTorchvoc.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrTorchvoc.setApproveStatus(0L);
         return toAjax(tPssrTorchvocService.insertTPssrTorchvoc(tPssrTorchvoc));
     }

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

@@ -189,7 +189,9 @@ public class TPssrVesselController extends BaseController {
     @Log(title = "压力容器", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrVessel tPssrVessel) {
-
+        if (tPssrVessel.getConfirmer1().equals(tPssrVessel.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrVessel.setApproveStatus(0L);
         tPssrVessel.setCreatedate(new Date());
         tPssrVessel.setCreaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/pssr/domain/TPssrCleaning.java

@@ -3,6 +3,7 @@ package com.ruoyi.project.pssr.domain;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import com.ruoyi.framework.web.domain.BaseEntity;
+import com.ruoyi.project.pssr.domain.vo.TPssrCleaningVo;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -112,6 +113,26 @@ public class TPssrCleaning extends BaseEntity
 
     private String reason;
 
+    private List<TPssrCleaningVo> contentList;
+
+    public List<TPssrCleaningVo> getContentList() {
+        return contentList;
+    }
+
+    public void setContentList(List<TPssrCleaningVo> contentList) {
+        this.contentList = contentList;
+    }
+
+    private String devType;
+
+    public String getDevType() {
+        return devType;
+    }
+
+    public void setDevType(String devType) {
+        this.devType = devType;
+    }
+
     public String getReason() {
         return reason;
     }

master/src/main/java/com/ruoyi/project/pssr/domain/vo/TPssrCleaningVo.java

@@ -0,0 +1,38 @@
+package com.ruoyi.project.pssr.domain.vo;
+
+public class TPssrCleaningVo {
+
+    private int num;
+    private String content;
+    private String result;
+
+    public TPssrCleaningVo(int num, String content, String result) {
+        this.num = num;
+        this.content = content;
+        this.result = result;
+    }
+
+    public int getNum() {
+        return num;
+    }
+
+    public void setNum(int num) {
+        this.num = num;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getResult() {
+        return result;
+    }
+
+    public void setResult(String result) {
+        this.result = result;
+    }
+}

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

@@ -27,10 +27,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="confirm1Name"    column="confirm1_name"    />
         <result property="confirm2Name"    column="confirm2_name"    />
+        <result property="devType"    column="dev_type"    />
     </resultMap>
 
     <sql id="selectTPssrCleaningVo">
-        select d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.unit, d.dev_no, d.serial_number, d.check_content, d.check_result, d.confirm1, d.confirm2, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_cleaning d
+        select d.dev_type,d.id, u1.nick_name confirm1_name, u2.nick_name confirm2_name, d.sub_id, d.approve_id, d.unit, d.dev_no, d.serial_number, d.check_content, d.check_result, d.confirm1, d.confirm2, d.confirmation_date, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.approve_status ,s.dept_name from t_pssr_cleaning d
       left join sys_dept s on s.dept_id = d.dept_id
       left join sys_user u1 on u1.user_id = d.CONFIRM1
       left join sys_user u2 on u2.user_id = d.CONFIRM2
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedate != null "> and updatedate = #{updatedate}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="devType!= null  and devType!=''"> and dev_type = #{devType}</if>
             <if test="approveStatus != null "> and approve_status = #{approveStatus}</if>
             <if test="searchValue != null "> and (dev_no like concat('%',concat(#{searchValue},'%')))</if>
             and d.del_flag = 0
@@ -104,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id,</if>
             <if test="remarks != null">remarks,</if>
             <if test="approveStatus != null">approve_status,</if>
+            <if test="devType != null">dev_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -125,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">#{deptId},</if>
             <if test="remarks != null">#{remarks},</if>
             <if test="approveStatus != null">#{approveStatus},</if>
+            <if test="devType != null">#{devType},</if>
          </trim>
     </insert>
 
@@ -149,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="remarks != null   and remarks != ''">remarks = #{remarks},</if>
             <if test="approveStatus != null">approve_status = #{approveStatus},</if>
+            <if test="devType != null">dev_type = #{devType},</if>
         </trim>
         where id = #{id}
     </update>

ui/src/views/pssr/cleaning/index.vue

@@ -148,8 +148,18 @@
         </template>
       </el-table-column>
       <el-table-column label="单元号" align="center" prop="unit" :show-overflow-tooltip="true" width="100"/>
-      <el-table-column label="检查内容" align="center" prop="checkContent" :show-overflow-tooltip="true"/>
-      <el-table-column label="检查结果" align="center" prop="checkResult" :show-overflow-tooltip="true"/>
+      <el-table-column label="设备类型" align="center" prop="devType" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="位号" align="center" prop="devNo" :show-overflow-tooltip="true" width="180"/>
+      <!-- 展开行 -->
+      <el-table-column  label="检查项目" align="center" width="600">
+        <template  slot-scope="scope">
+          <el-table :data="scope.row.contentList" :show-header="false" style="width: 100%">
+            <el-table-column label="编号" prop="num" align="center" width="80"/>
+            <el-table-column label="检查内容" prop="content" align="center"/>
+            <el-table-column label="检查结果" prop="result" align="center" width="80"/>
+          </el-table>
+        </template>
+      </el-table-column>
       <el-table-column label="确认人1" align="center" prop="confirm1" :show-overflow-tooltip="true"
                        width="150">
         <template slot-scope="scope">
@@ -167,9 +177,9 @@
           <span>{{ parseTime(scope.row.confirmationDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true"/>
-      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width"
+      <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
+      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width"
                        v-if="isApprove==0">
         <template slot-scope="scope">
 
@@ -210,19 +220,25 @@
     />
 
     <!-- 添加或修改设备清洁对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="50%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="单元号" prop="unit">
           <el-input v-model="form.unit" placeholder="请输入单元号"/>
         </el-form-item>
-        <el-form-item label="检查内容">
-          <el-input type="textarea" v-model="form.checkContent" :min-height="192"/>
+        <el-form-item label="设备类型" prop="devType">
+          <el-select v-model="form.devType" placeholder="请选择设备类型">
+            <el-option label="开工锅炉" value="开工锅炉"/>
+            <el-option label="裂解炉" value="裂解炉"/>
+            <el-option label="塔" value="塔"/>
+            <el-option label="罐" value="罐"/>
+            <el-option label="反应器" value="反应器"/>
+            <el-option label="干燥器" value="干燥器"/>
+            <el-option label="换热器" value="换热器"/>
+            <el-option label="冷箱" value="冷箱"/>
+          </el-select>
         </el-form-item>
-        <el-form-item label="检查结果" prop="checkResult">
-          <el-radio-group v-model="form.checkResult">
-            <el-radio label="✔">✔</el-radio>
-            <el-radio label="✖">✖</el-radio>
-          </el-radio-group>
+        <el-form-item label="位号" prop="devNo">
+          <el-input v-model="form.devNo" placeholder="请输入位号"/>
         </el-form-item>
         <el-form-item label="确认人1" prop="confirm1">
           <el-select v-model="form.confirm1" clearable filterable style="width: 100%;"
@@ -246,6 +262,28 @@
           <el-input v-model="form.remarks" placeholder="请输入备注"/>
         </el-form-item>
       </el-form>
+
+      <!-- 子项数据表格 -->
+      <el-table :data="form.contentList" style="width: 100%">
+        <el-table-column label="编号" prop="num" align="center" width="100">
+          <template #default="{ row, column, $index }">
+            <el-input v-model="row.num" @input="handleSubItemChange($index, row.num)"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="检查内容" prop="content" align="center">
+          <template #default="{ row, column, $index }">
+            <el-input v-model="row.content" @input="handleSubItemChange($index, row.content)"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column label="检查结果" prop="result" align="center">
+          <template #default="{ row, column, $index }">
+<!--            <el-input v-model="row.result" @input="handleSubItemChange($index, row.result)"></el-input>-->
+            <el-radio v-model="row.result" @change="handleSubItemChange($index, row.result)" label="✔">✔</el-radio>
+            <el-radio v-model="row.result" @change="handleSubItemChange($index, row.result)"  label="✖">✖</el-radio>
+          </template>
+        </el-table-column>
+      </el-table>
+
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -498,6 +536,16 @@ export default {
     });
   },
   methods: {
+    // 处理子项的编辑
+    handleSubItemChangeNum(index, newValue) {
+      this.form.contentList[index].num = newValue;
+    },
+    handleSubItemChangeContent(index, newValue) {
+      this.form.contentList[index].content = newValue;
+    },
+    handleSubItemChangeResult(index, newValue) {
+      this.form.contentList[index].result = newValue;
+    },
     /** 查询设备清洁列表 */
     getList() {
       this.loading = true;