PSSR功能修改及bug修复

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

@@ -1,5 +1,6 @@
 package com.ruoyi.project.pssr.controller;
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
@@ -118,8 +119,8 @@ public class TPssrAboveallController extends BaseController {
     @Log(title = "PSSR", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrAboveall tPssrAboveall) {
-        if (tPssrAboveall.getIncludePublic()==1) {
-            tPssrAboveall.setUnit(tPssrAboveall.getUnit()+",390");
+        if (tPssrAboveall.getIncludePublic() == 1) {
+            tPssrAboveall.setUnit(tPssrAboveall.getUnit() + ",390");
         }
         tPssrAboveallService.insertTPssrAboveall(tPssrAboveall);//新增主表数据
 
@@ -366,38 +367,39 @@ public class TPssrAboveallController extends BaseController {
      * 生成安全阀数据
      */
     private void genAqf(TPssrSubcontent subcontent, String userId) {
-        for (String unit : subcontent.getUnit().split(",")) {
-            TSafetyvavle query = new TSafetyvavle();
-            query.setSubarea(unit);
-            for (TSafetyvavle vavle : tSafetyvavleService.selectTSafetyvavleList(query)) {
-                TPssrSafetyValve pssr = new TPssrSafetyValve();
-                pssr.setUnit(unit);
-                pssr.setSubId(subcontent.getId());
-                pssr.setDevNo(vavle.getTagno());
-                pssr.setInstallLocation(vavle.getPlacedesc());
-                pssr.setSafetyDev(vavle.getService());
-                pssr.setPidNo(vavle.getPid());
-                pssr.setSetPressure(vavle.getSettingpres());
-                pssr.setApproveStatus(0L);
-                pssr.setCreatedate(new Date());
-                pssr.setCreaterCode(userId);
-                tPssrSafetyValveService.insertTPssrSafetyValve(pssr);
+        if (StringUtils.isNotEmpty(subcontent.getUnit()))
+            for (String unit : subcontent.getUnit().split(",")) {
+                TSafetyvavle query = new TSafetyvavle();
+                query.setSubarea(unit);
+                for (TSafetyvavle vavle : tSafetyvavleService.selectTSafetyvavleList(query)) {
+                    TPssrSafetyValve pssr = new TPssrSafetyValve();
+                    pssr.setUnit(unit);
+                    pssr.setSubId(subcontent.getId());
+                    pssr.setDevNo(vavle.getTagno());
+                    pssr.setInstallLocation(vavle.getPlacedesc());
+                    pssr.setSafetyDev(vavle.getService());
+                    pssr.setPidNo(vavle.getPid());
+                    pssr.setSetPressure(vavle.getSettingpres());
+                    pssr.setApproveStatus(0L);
+                    pssr.setCreatedate(new Date());
+                    pssr.setCreaterCode(userId);
+                    tPssrSafetyValveService.insertTPssrSafetyValve(pssr);
+                }
             }
-        }
     }
 
     /**
      * 生成公用工程数据
      */
     private void genGygc(Long subId, String userId) {
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统N2已投用或具备投用条件。", "界区阀已打开，N2总管压力390PI9114压力达    kpa。", "N2总管压力390PI9114压力达    kpa。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统IA已投用或具备投用条件：", "界区阀已打开，IA管压力PI3901压力达    kpa。", "IA管压力PI3901压力达    kpa。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统PA已投用或具备投用条件。", "界区阀已打开，PA管压力PI3902压力达    kpa。", "PA管压力PI3902压力达    kpa。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统CW已投用或具备投用条件。", "界区阀已打开，CW进出口压差达    kpa。", "CW进出口压差达    kpa。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统高压蒸汽已投用或具备投用条件。", "界区阀已打开，PC9112压力达    Mpa，TI9061温度达    ℃。", "PC9112压力达    Mpa，TI9061温度达    ℃。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统中压蒸汽已投用或具备投用条件。", "界区阀已打开，PC9081压力达    Mpa，TI9081温度达    ℃。", "PC9081压力达    Mpa，TI9081温度达    ℃。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统低压蒸汽已投用或具备投用条件。", "界区阀已打开，PY9109压力达    Mpa，TI9115温度达    ℃。", "PY9109压力达    Mpa，TI9115温度达    ℃。", userId, new Date()));
-        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统精制凝液已投用或具备投用条件。", "界区阀已打开，P3505A/B/C压力达    Mpa。", "P3505A/B/C压力达    Mpa。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统N2已投用或具备投用条件。", "界区阀已打开，N2总管压力390PI9114压力达(    )kpa。", "N2总管压力390PI9114压力达(    )kpa。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统IA已投用或具备投用条件：", "界区阀已打开，IA管压力PI3901压力达(    )kpa。", "IA管压力PI3901压力达(    )kpa。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统PA已投用或具备投用条件。", "界区阀已打开，PA管压力PI3902压力达(    )kpa。", "PA管压力PI3902压力达(    )kpa。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统CW已投用或具备投用条件。", "界区阀已打开，CW进出口压差达(    )kpa。", "CW进出口压差达(    )kpa。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统高压蒸汽已投用或具备投用条件。", "界区阀已打开，PC9112压力达(    )Mpa，TI9061温度达(    )℃。", "PC9112压力达(    )Mpa，TI9061温度达(    )℃。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统中压蒸汽已投用或具备投用条件。", "界区阀已打开，PC9081压力达(    )Mpa，TI9081温度达(    )℃。", "PC9081压力达(    )Mpa，TI9081温度达(    )℃。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统低压蒸汽已投用或具备投用条件。", "界区阀已打开，PY9109压力达(    )Mpa，TI9115温度达(    )℃。", "PY9109压力达(    )Mpa，TI9115温度达(    )℃。", userId, new Date()));
+        tPssrPublicService.insertTPssrPublic(new TPssrPublic(subId, "公用工程系统精制凝液已投用或具备投用条件。", "界区阀已打开，P3505A/B/C压力达(    )Mpa。", "P3505A/B/C压力达(    )Mpa。", userId, new Date()));
     }
 
     /**

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

@@ -235,6 +235,9 @@ public class TPssrAirtightController extends BaseController {
     @Log(title = "气密", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrAirtight tPssrAirtight) {
+        if (tPssrAirtight.getConfirm1().equals(tPssrAirtight.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrAirtight.getFileIds(), forShort, tPssrAirtight.getId(), tPssrAirtight.getSubId());
         try {
             String initialPressure = tPssrAirtight.getInitialPressure();//初始压力
@@ -260,6 +263,9 @@ public class TPssrAirtightController extends BaseController {
     @Log(title = "气密", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editBatch(@RequestBody TPssrAirtight tPssrAirtight) {
+        if (tPssrAirtight.getConfirm1().equals(tPssrAirtight.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrAirtightMapper.updateTPssrAirtightByIds(tPssrAirtight));
     }
 
@@ -299,6 +305,9 @@ public class TPssrAirtightController extends BaseController {
         if (tPssrAirtight.getIds() != null && tPssrAirtight.getIds().length > 0) {
             for (Long id : tPssrAirtight.getIds()) {
                 TPssrAirtight item = tPssrAirtightService.selectTPssrAirtightById(id);
+                if (item.getUptoStandard().equals("否")){
+                    return AjaxResult.error("气密检查不合格，请重新确认！");
+                }
                 item.setApproveStatus(approveStatus);
                 if (queryStatus == 3) {
                     item.setConfirmationDate(date);
@@ -310,6 +319,9 @@ public class TPssrAirtightController extends BaseController {
             lock.setSubId(tPssrAirtight.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrAirtight item : tPssrAirtightService.selectTPssrAirtightList(lock)) {
+                if (item.getUptoStandard().equals("否")){
+                    return AjaxResult.error("气密检查不合格，请重新确认！");
+                }
                 if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }

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

@@ -270,6 +270,9 @@ public class TPssrAnalyzerController extends BaseController {
     @Log(title = "在线分析仪", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrAnalyzer tPssrAnalyzer) {
+        if (tPssrAnalyzer.getConfirm1().equals(tPssrAnalyzer.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrAnalyzer.getFileIds(), forShort, tPssrAnalyzer.getId(), tPssrAnalyzer.getSubId());
         return toAjax(tPssrAnalyzerService.updateTPssrAnalyzer(tPssrAnalyzer));
     }
@@ -281,6 +284,9 @@ public class TPssrAnalyzerController extends BaseController {
     @Log(title = "在线分析仪", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrAnalyzer tPssrAnalyzer) {
+        if (tPssrAnalyzer.getConfirm1().equals(tPssrAnalyzer.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrAnalyzerMapper.updateTPssrAnalyzerByIds(tPssrAnalyzer));
     }
 

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

@@ -296,6 +296,9 @@ public class TPssrBlindController extends BaseController {
     @Log(title = "盲板", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrBlind tPssrBlind) {
+        if (tPssrBlind.getInConfirm1().equals(tPssrBlind.getInConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrBlind.getFileIds(), forShort, tPssrBlind.getId(), tPssrBlind.getSubId());
         return toAjax(tPssrBlindService.updateTPssrBlind(tPssrBlind));
     }
@@ -307,6 +310,9 @@ public class TPssrBlindController extends BaseController {
     @Log(title = "盲板", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrBlind tPssrBlind) {
+        if (tPssrBlind.getInConfirm1().equals(tPssrBlind.getInConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrBlindMapper.updateTPssrBlindByIds(tPssrBlind));
     }
 

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

@@ -291,6 +291,9 @@ public class TPssrCircuitController extends BaseController {
     @Log(title = "短接", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrCircuit tPssrCircuit) {
+        if (tPssrCircuit.getConfirm1().equals(tPssrCircuit.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrCircuit.getFileIds(), "dj", tPssrCircuit.getId(), tPssrCircuit.getSubId());
         return toAjax(tPssrCircuitService.updateTPssrCircuit(tPssrCircuit));
     }
@@ -302,6 +305,9 @@ public class TPssrCircuitController extends BaseController {
     @Log(title = "短接", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrCircuit tPssrCircuit) {
+        if (tPssrCircuit.getConfirm1().equals(tPssrCircuit.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrCircuitMapper.updateTPssrCircuitByIds(tPssrCircuit));
     }
 

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

@@ -274,6 +274,9 @@ public class TPssrCleaningController extends BaseController {
     @Log(title = "设备清洁", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrCleaning tPssrCleaning) {
+        if (tPssrCleaning.getConfirm1().equals(tPssrCleaning.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrCleaning.getFileIds(), "sbqjd", tPssrCleaning.getId(), tPssrCleaning.getSubId());
         return toAjax(tPssrCleaningService.updateTPssrCleaning(tPssrCleaning));
     }
@@ -285,6 +288,9 @@ public class TPssrCleaningController extends BaseController {
     @Log(title = "设备清洁", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrCleaning tPssrCleaning) {
+        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

@@ -280,6 +280,9 @@ public class TPssrFrameController extends BaseController {
     @Log(title = "支（吊）架", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrFrame tPssrFrame) {
+        if (tPssrFrame.getConfirm1().equals(tPssrFrame.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrFrame.getFileIds(), forShort, tPssrFrame.getId(), tPssrFrame.getSubId());
         return toAjax(tPssrFrameService.updateTPssrFrame(tPssrFrame));
     }
@@ -291,6 +294,9 @@ public class TPssrFrameController extends BaseController {
     @Log(title = "支（吊）架", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrFrame tPssrFrame) {
+        if (tPssrFrame.getConfirm1().equals(tPssrFrame.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrFrameMapper.updateTPssrFrameByIds(tPssrFrame));
     }
 

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

@@ -262,6 +262,9 @@ public class TPssrFranklinismController extends BaseController {
     @Log(title = "静电接地，跨接", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrFranklinism tPssrFranklinism) {
+        if (tPssrFranklinism.getConfirm1().equals(tPssrFranklinism.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrFranklinism.getFileIds(), "jdjdkj", tPssrFranklinism.getId(), tPssrFranklinism.getSubId());
         return toAjax(tPssrFranklinismService.updateTPssrFranklinism(tPssrFranklinism));
     }
@@ -273,6 +276,9 @@ public class TPssrFranklinismController extends BaseController {
     @Log(title = "静电接地，跨接", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrFranklinism tPssrFranklinism) {
+        if (tPssrFranklinism.getConfirm1().equals(tPssrFranklinism.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrFranklinismMapper.updateTPssrFranklinismByIds(tPssrFranklinism));
     }
 

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

@@ -268,6 +268,9 @@ public class TPssrGasdetectorController extends BaseController {
     @Log(title = "气体检测器", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrGasdetector tPssrGasdetector) {
+        if (tPssrGasdetector.getConfirm1().equals(tPssrGasdetector.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrGasdetector.getFileIds(), "qtjcy", tPssrGasdetector.getId(), tPssrGasdetector.getSubId());
         return toAjax(tPssrGasdetectorService.updateTPssrGasdetector(tPssrGasdetector));
     }
@@ -279,6 +282,9 @@ public class TPssrGasdetectorController extends BaseController {
     @Log(title = "气体检测器", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrGasdetector tPssrGasdetector) {
+        if (tPssrGasdetector.getConfirm1().equals(tPssrGasdetector.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrGasdetectorMapper.updateTPssrGasdetectorByIds(tPssrGasdetector));
     }
 

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

@@ -271,6 +271,9 @@ public class TPssrInstrumentCalibrationController extends BaseController {
     @Log(title = "仪表校验", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration) {
+        if (tPssrInstrumentCalibration.getConfirm1().equals(tPssrInstrumentCalibration.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrInstrumentCalibration.getFileIds(), "ybjy", tPssrInstrumentCalibration.getId(), tPssrInstrumentCalibration.getSubId());
         return toAjax(tPssrInstrumentCalibrationService.updateTPssrInstrumentCalibration(tPssrInstrumentCalibration));
     }
@@ -282,6 +285,9 @@ public class TPssrInstrumentCalibrationController extends BaseController {
     @Log(title = "仪表校验", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration) {
+        if (tPssrInstrumentCalibration.getConfirm1().equals(tPssrInstrumentCalibration.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrInstrumentCalibrationMapper.updateTPssrInstrumentCalibrationByIds(tPssrInstrumentCalibration));
     }
 

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

@@ -191,6 +191,9 @@ public class TPssrLightingController extends BaseController {
     @Log(title = "照明", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrLighting tPssrLighting) {
+        if (tPssrLighting.getConfirm1().equals(tPssrLighting.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrLighting.getFileIds(), "zmdbr", tPssrLighting.getId(), tPssrLighting.getSubId());
         return toAjax(tPssrLightingService.updateTPssrLighting(tPssrLighting));
     }
@@ -202,6 +205,9 @@ public class TPssrLightingController extends BaseController {
     @Log(title = "照明", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrLighting tPssrLighting) {
+        if (tPssrLighting.getConfirm1().equals(tPssrLighting.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrLightingMapper.updateTPssrLightingByIds(tPssrLighting));
     }
 

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

@@ -254,6 +254,9 @@ public class TPssrLockController extends BaseController {
     @Log(title = "锁开锁关阀门状态", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrLock tPssrLock) {
+        if (tPssrLock.getLockeder().equals(tPssrLock.getConfirm())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrLock.getFileIds(), "sksgfmzt", tPssrLock.getId(), tPssrLock.getSubId());
         return toAjax(tPssrLockService.updateTPssrLock(tPssrLock));
     }
@@ -265,6 +268,9 @@ public class TPssrLockController extends BaseController {
     @Log(title = "锁开锁关阀门状态", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrLock tPssrLock) {
+        if (tPssrLock.getLockeder().equals(tPssrLock.getConfirm())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrLockMapper.updateTPssrLockByIds(tPssrLock));
     }
 

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

@@ -297,6 +297,9 @@ public class TPssrMaterialController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMaterial tPssrMaterial) {
+        if (tPssrMaterial.getConfirm1().equals(tPssrMaterial.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrMaterial.getFileIds(), "yfl", tPssrMaterial.getId(), tPssrMaterial.getSubId());
         return toAjax(tPssrMaterialService.updateTPssrMaterial(tPssrMaterial));
     }
@@ -308,6 +311,9 @@ public class TPssrMaterialController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.UPDATE)
     @PutMapping("editBatch")
     public AjaxResult editBatch(@RequestBody TPssrMaterial tPssrMaterial) {
+        if (tPssrMaterial.getConfirm1().equals(tPssrMaterial.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrMaterialMapper.updateTPssrMaterialByIds(tPssrMaterial));
     }
 

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

@@ -116,6 +116,9 @@ public class TPssrMaterialRawController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMaterialRaw tPssrMaterialRaw) {
+        if (tPssrMaterialRaw.getConfirm1().equals(tPssrMaterialRaw.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrMaterialRaw.getFileIds(), "yfl-raw", tPssrMaterialRaw.getId(), tPssrMaterialRaw.getSubId());
         return toAjax(tPssrMaterialRawService.updateTPssrMaterialRaw(tPssrMaterialRaw));
     }
@@ -127,6 +130,9 @@ public class TPssrMaterialRawController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.UPDATE)
     @PutMapping("editBatch")
     public AjaxResult editBatch(@RequestBody TPssrMaterialRaw tPssrMaterialRaw) {
+        if (tPssrMaterialRaw.getConfirm1().equals(tPssrMaterialRaw.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrMaterialRawMapper.updateTPssrMaterialRawByIds(tPssrMaterialRaw));
     }
 

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

@@ -285,6 +285,9 @@ public class TPssrMeasureController extends BaseController {
     @Log(title = "人身防护", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMeasure tPssrMeasure) {
+        if (tPssrMeasure.getConfirm1().equals(tPssrMeasure.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrMeasure.getFileIds(), "rsfh-m", tPssrMeasure.getId(), tPssrMeasure.getSubId());
         return toAjax(tPssrMeasureService.updateTPssrMeasure(tPssrMeasure));
     }
@@ -296,6 +299,9 @@ public class TPssrMeasureController extends BaseController {
     @Log(title = "人身防护", businessType = BusinessType.UPDATE)
     @PutMapping("editBatch")
     public AjaxResult editBatch(@RequestBody TPssrMeasure tPssrMeasure) {
+        if (tPssrMeasure.getConfirm1().equals(tPssrMeasure.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrMeasureMapper.updateTPssrMeasureByIds(tPssrMeasure));
     }
 

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

@@ -241,6 +241,9 @@ public class TPssrMocController extends BaseController {
     @Log(title = "MOC完成确认清单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMoc tPssrMoc) {
+        if (tPssrMoc.getConfirm1().equals(tPssrMoc.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrMoc.getFileIds(), forShort, tPssrMoc.getId(), tPssrMoc.getSubId());
         return toAjax(tPssrMocService.updateTPssrMoc(tPssrMoc));
     }
@@ -252,6 +255,9 @@ public class TPssrMocController extends BaseController {
     @Log(title = "MOC完成确认清单", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrMoc tPssrMoc) {
+        if (tPssrMoc.getConfirm1().equals(tPssrMoc.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrMocMapper.updateTPssrMocByIds(tPssrMoc));
     }
 

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

@@ -269,6 +269,9 @@ public class TPssrMotorController extends BaseController {
     @Log(title = "电机设备", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrMotor tPssrMotor) {
+        if (tPssrMotor.getConfirm1().equals(tPssrMotor.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrMotor.getFileIds(), "djsb", tPssrMotor.getId(), tPssrMotor.getSubId());
         return toAjax(tPssrMotorService.updateTPssrMotor(tPssrMotor));
     }
@@ -280,6 +283,9 @@ public class TPssrMotorController extends BaseController {
     @Log(title = "电机设备", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrMotor tPssrMotor) {
+        if (tPssrMotor.getConfirm1().equals(tPssrMotor.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrMotorMapper.updateTPssrMotorByIds(tPssrMotor));
     }
 

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

@@ -316,6 +316,9 @@ public class TPssrNitrogenController extends BaseController {
     @Log(title = "系统氮气置换", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrNitrogen tPssrNitrogen) {
+        if (tPssrNitrogen.getConfirm1().equals(tPssrNitrogen.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrNitrogen.getFileIds(), "dqzh", tPssrNitrogen.getId(), tPssrNitrogen.getSubId());
         this.verifySatndard(tPssrNitrogen);
         return toAjax(tPssrNitrogenService.updateTPssrNitrogen(tPssrNitrogen));
@@ -329,6 +332,9 @@ public class TPssrNitrogenController extends BaseController {
     @Log(title = "系统氮气置换", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrNitrogen tPssrNitrogen) {
+        if (tPssrNitrogen.getConfirm1().equals(tPssrNitrogen.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrNitrogenMapper.updateTPssrNitrogenByIds(tPssrNitrogen));
     }
 
@@ -368,6 +374,9 @@ public class TPssrNitrogenController extends BaseController {
         if (tPssrNitrogen.getIds() != null && tPssrNitrogen.getIds().length > 0) {
             for (Long id : tPssrNitrogen.getIds()) {
                 TPssrNitrogen item = tPssrNitrogenService.selectTPssrNitrogenById(id);
+                if (item.getStandard().equals("否")){
+                    return AjaxResult.error("氮气置换不合格，请重新确认！");
+                }
                 item.setApproveStatus(approveStatus);
                 if (queryStatus == 3) {
                     item.setConfirmationDate(date);
@@ -379,6 +388,9 @@ public class TPssrNitrogenController extends BaseController {
             lock.setSubId(tPssrNitrogen.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrNitrogen item : tPssrNitrogenService.selectTPssrNitrogenList(lock)) {
+                if (item.getStandard().equals("否")){
+                    return AjaxResult.error("氮气置换不合格，请重新确认！");
+                }
                 if (queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }

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

@@ -242,6 +242,9 @@ public class TPssrPipeController extends BaseController {
     @Log(title = "管道", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPipe tPssrPipe) {
+        if (tPssrPipe.getConfirmer1().equals(tPssrPipe.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrPipe.getFileIds(), "ylgd", tPssrPipe.getId(), tPssrPipe.getSubId());
         return toAjax(tPssrPipeService.updateTPssrPipe(tPssrPipe));
     }
@@ -253,6 +256,9 @@ public class TPssrPipeController extends BaseController {
     @Log(title = "管道批量修改", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editBatch(@RequestBody TPssrPipe tPssrPipe) {
+        if (tPssrPipe.getConfirmer1().equals(tPssrPipe.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         logger.info(JSON.toJSONString(tPssrPipe));
         return toAjax(tPssrPipeMapper.updateTPssrPipeByIds(tPssrPipe));
     }

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

@@ -185,6 +185,9 @@ public class TPssrPowerController extends BaseController {
     @Log(title = "临时电源", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPower tPssrPower) {
+        if (tPssrPower.getConfirm1().equals(tPssrPower.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrPower.getFileIds(), "lsdy", tPssrPower.getId(), tPssrPower.getSubId());
         return toAjax(tPssrPowerService.updateTPssrPower(tPssrPower));
     }
@@ -196,6 +199,9 @@ public class TPssrPowerController extends BaseController {
     @Log(title = "临时电源", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrPower tPssrPower) {
+        if (tPssrPower.getConfirm1().equals(tPssrPower.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrPowerMapper.updateTPssrPowerByIds(tPssrPower));
     }
     /**

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

@@ -275,6 +275,9 @@ public class TPssrProtectionController extends BaseController {
     @Log(title = "人身防护", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrProtection tPssrProtection) {
+        if (tPssrProtection.getConfirm1().equals(tPssrProtection.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrProtection.getFileIds(), "rsfh", tPssrProtection.getId(), tPssrProtection.getSubId());
         return toAjax(tPssrProtectionService.updateTPssrProtection(tPssrProtection));
     }
@@ -286,6 +289,9 @@ public class TPssrProtectionController extends BaseController {
     @Log(title = "人身防护", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrProtection tPssrProtection) {
+        if (tPssrProtection.getConfirm1().equals(tPssrProtection.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrProtectionMapper.updateTPssrProtectionByIds(tPssrProtection));
     }
 

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

@@ -179,13 +179,16 @@ public class TPssrPublicController extends BaseController {
     @Log(title = "公用工程", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPublic tPssrPublic) {
+        if (tPssrPublic.getConfirm1().equals(tPssrPublic.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         try {
             String checkRequire = tPssrPublic.getCheckRequire().replace(" ", "");
             String checkCondition = tPssrPublic.getCheckCondition().replace(" ", "");
             String valveStatus = tPssrPublic.getValveStatus();
             if (!"已打开".equals(valveStatus)) {
                 tPssrPublic.setCheckResult("✖");
-            } else if (checkRequire.contains("达") && checkCondition.contains("达")) {
+            } else if (checkRequire.contains("达(") && checkCondition.contains("达(")) {
                 String rKpa = "0";
                 String rycKpa = "0";
                 String rTemp = "0";
@@ -194,30 +197,32 @@ public class TPssrPublicController extends BaseController {
                 String cTemp = "-1";
                 String cMpa = "-1";
                 String cycKpa = "-1";
-                if (checkRequire.contains("压力达") && checkRequire.contains("kpa"))
-                    rKpa = checkRequire.substring(checkRequire.indexOf("压力达") + 3, checkRequire.indexOf("kpa")).trim();
-                if (checkRequire.contains("压差达"))
-                    rycKpa = checkRequire.substring(checkRequire.indexOf("压差达") + 3, checkRequire.indexOf("kpa")).trim();
-                if (checkRequire.contains("温度达"))
-                    rTemp = checkRequire.substring(checkRequire.indexOf("温度达") + 3, checkRequire.indexOf("℃")).trim();
-                if (checkRequire.contains("压力达") && checkRequire.contains("Mpa"))
-                    rMpa = checkRequire.substring(checkRequire.indexOf("压力达") + 3, checkRequire.indexOf("Mpa")).trim();
-                if (checkCondition.contains("压力达") && checkCondition.contains("kpa"))
-                    cKpa = checkCondition.substring(checkCondition.indexOf("压力达") + 3, checkCondition.indexOf("kpa")).trim();
-                if (checkCondition.contains("压差达"))
-                    cycKpa = checkCondition.substring(checkCondition.indexOf("压差达") + 3, checkCondition.indexOf("kpa")).trim();
-                if (checkCondition.contains("温度达"))
-                    cTemp = checkCondition.substring(checkCondition.indexOf("温度达") + 3, checkCondition.indexOf("℃")).trim();
-                if (checkCondition.contains("压力达") && checkCondition.contains("Mpa"))
-                    cMpa = checkCondition.substring(checkCondition.indexOf("压力达") + 3, checkCondition.indexOf("Mpa")).trim();
+                if (checkRequire.contains("压力达(") && checkRequire.contains(")kPa"))
+                    rKpa = checkRequire.substring(checkRequire.indexOf("压力达(") + 3, checkRequire.indexOf(")kPa")).trim();
+                if (checkRequire.contains("压差达("))
+                    rycKpa = checkRequire.substring(checkRequire.indexOf("压差达(") + 3, checkRequire.indexOf(")kPa")).trim();
+                if (checkRequire.contains("温度达("))
+                    rTemp = checkRequire.substring(checkRequire.indexOf("温度达(") + 3, checkRequire.indexOf(")℃")).trim();
+                if (checkRequire.contains("压力达(") && checkRequire.contains(")MPa"))
+                    rMpa = checkRequire.substring(checkRequire.indexOf("压力达(") + 3, checkRequire.indexOf(")MPa")).trim();
+                if (checkCondition.contains("压力达(") && checkCondition.contains(")kPa"))
+                    cKpa = checkCondition.substring(checkCondition.indexOf("压力达(") + 3, checkCondition.indexOf(")kPa")).trim();
+                if (checkCondition.contains("压差达("))
+                    cycKpa = checkCondition.substring(checkCondition.indexOf("压差达(") + 3, checkCondition.indexOf(")kPa")).trim();
+                if (checkCondition.contains("温度达("))
+                    cTemp = checkCondition.substring(checkCondition.indexOf("温度达(") + 3, checkCondition.indexOf(")℃")).trim();
+                if (checkCondition.contains("压力达(") && checkCondition.contains("MPa"))
+                    cMpa = checkCondition.substring(checkCondition.indexOf("压力达(") + 3, checkCondition.indexOf(")MPa")).trim();
 
                 if (new BigDecimal(rKpa).compareTo(new BigDecimal(cKpa)) <= 0 || new BigDecimal(rycKpa).compareTo(new BigDecimal(cycKpa)) <= 0 ||
                         (new BigDecimal(rTemp).compareTo(new BigDecimal(cTemp)) <= 0 && new BigDecimal(rMpa).compareTo(new BigDecimal(cMpa)) <= 0)
-                        || (new BigDecimal(rMpa).compareTo(new BigDecimal(cMpa)) <= 0 && !checkRequire.contains("℃"))) {
+                        || (new BigDecimal(rMpa).compareTo(new BigDecimal(cMpa)) <= 0 && !checkRequire.contains(")℃"))) {
                     tPssrPublic.setCheckResult("✔");
                 } else {
                     tPssrPublic.setCheckResult("✖");
                 }
+            }else{
+                return AjaxResult.error("检查条件/内容不符合填写要求");
             }
         } catch (Exception e) {
             logger.error(e.getMessage());
@@ -267,6 +272,9 @@ public class TPssrPublicController extends BaseController {
     @Log(title = "公用工程", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrPublic tPssrPublic) {
+        if (tPssrPublic.getConfirm1().equals(tPssrPublic.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrPublicMapper.updateTPssrPublicByIds(tPssrPublic));
     }
 
@@ -305,6 +313,9 @@ public class TPssrPublicController extends BaseController {
         if (tPssrPublic.getIds() != null && tPssrPublic.getIds().length > 0) {
             for (Long id : tPssrPublic.getIds()) {
                 TPssrPublic item = tPssrPublicService.selectTPssrPublicById(id);
+                if (item.getCheckResult().equals("✖")){
+                    return AjaxResult.error("公用工程检查不合格，请重新确认！");
+                }
                 item.setApproveStatus(approveStatus);
                 if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
@@ -316,6 +327,9 @@ public class TPssrPublicController extends BaseController {
             lock.setSubId(tPssrPublic.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrPublic item : tPssrPublicService.selectTPssrPublicList(lock)) {
+                if (item.getCheckResult().equals("✖")){
+                    return AjaxResult.error("公用工程检查不合格，请重新确认！");
+                }
                 if (item.getConfirmationDate() == null && queryStatus == 3) {
                     item.setConfirmationDate(date);
                 }

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

@@ -285,6 +285,9 @@ public class TPssrPumpCleaningController extends BaseController {
     @Log(title = "机泵过滤器清理工作清单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPumpCleaning tPssrPumpCleaning) {
+        if (tPssrPumpCleaning.getConfirmer1().equals(tPssrPumpCleaning.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrPumpCleaning.getFileIds(), forShort, tPssrPumpCleaning.getId(), tPssrPumpCleaning.getSubId());
         return toAjax(tPssrPumpCleaningService.updateTPssrPumpCleaning(tPssrPumpCleaning));
     }
@@ -296,6 +299,9 @@ public class TPssrPumpCleaningController extends BaseController {
     @Log(title = "机泵过滤器清理工作清单", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrPumpCleaning tPssrPumpCleaning) {
+        if (tPssrPumpCleaning.getConfirmer1().equals(tPssrPumpCleaning.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrPumpCleaningMapper.updateTPssrPumpCleaningByIds(tPssrPumpCleaning));
     }
     /**

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

@@ -288,6 +288,9 @@ public class TPssrPumpFillController extends BaseController {
     @Log(title = "机泵润滑油加注确认清单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPumpFill tPssrPumpFill) {
+        if (tPssrPumpFill.getConfirmer1().equals(tPssrPumpFill.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrPumpFill.getFileIds(), "jb-f", tPssrPumpFill.getId(), tPssrPumpFill.getSubId());
         return toAjax(tPssrPumpFillService.updateTPssrPumpFill(tPssrPumpFill));
     }
@@ -299,6 +302,9 @@ public class TPssrPumpFillController extends BaseController {
     @Log(title = "机泵润滑油加注确认清单", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrPumpFill tPssrPumpFill) {
+        if (tPssrPumpFill.getConfirmer1().equals(tPssrPumpFill.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrPumpFillMapper.updateTPssrPumpFillByIds(tPssrPumpFill));
     }
     /**

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

@@ -282,6 +282,9 @@ public class TPssrPumpOverhaulController extends BaseController {
     @Log(title = "机泵检修完成确认清单", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrPumpOverhaul tPssrPumpOverhaul) {
+        if (tPssrPumpOverhaul.getConfirmer1().equals(tPssrPumpOverhaul.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrPumpOverhaul.getFileIds(), "jb-o", tPssrPumpOverhaul.getId(), tPssrPumpOverhaul.getSubId());
         return toAjax(tPssrPumpOverhaulService.updateTPssrPumpOverhaul(tPssrPumpOverhaul));
     }
@@ -293,6 +296,9 @@ public class TPssrPumpOverhaulController extends BaseController {
     @Log(title = "机泵检修完成确认清单", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrPumpOverhaul tPssrPumpOverhaul) {
+        if (tPssrPumpOverhaul.getConfirmer1().equals(tPssrPumpOverhaul.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrPumpOverhaulMapper.updateTPssrPumpOverhaulByIds(tPssrPumpOverhaul));
     }
 

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

@@ -279,6 +279,9 @@ public class TPssrSafetyBleedController extends BaseController {
     @Log(title = "安全设施-紧急泄放阀", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyBleed tPssrSafetyBleed) {
+        if (tPssrSafetyBleed.getConfirmer1().equals(tPssrSafetyBleed.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrSafetyBleed.getFileIds(), forShort, tPssrSafetyBleed.getId(), tPssrSafetyBleed.getSubId());
         return toAjax(tPssrSafetyBleedService.updateTPssrSafetyBleed(tPssrSafetyBleed));
     }
@@ -290,6 +293,9 @@ public class TPssrSafetyBleedController extends BaseController {
     @Log(title = "安全设施-紧急泄放阀", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrSafetyBleed tPssrSafetyBleed) {
+        if (tPssrSafetyBleed.getConfirmer1().equals(tPssrSafetyBleed.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrSafetyBleedMapper.updateTPssrSafetyBleedByIds(tPssrSafetyBleed));
     }
     /**

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

@@ -279,6 +279,9 @@ public class TPssrSafetyBreathController extends BaseController {
     @Log(title = "安全设施-呼吸阀", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyBreath tPssrSafetyBreath) {
+        if (tPssrSafetyBreath.getConfirmer1().equals(tPssrSafetyBreath.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrSafetyBreath.getFileIds(), "aqss-bh", tPssrSafetyBreath.getId(), tPssrSafetyBreath.getSubId());
         return toAjax(tPssrSafetyBreathService.updateTPssrSafetyBreath(tPssrSafetyBreath));
     }
@@ -290,6 +293,9 @@ public class TPssrSafetyBreathController extends BaseController {
     @Log(title = "安全设施-呼吸阀", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrSafetyBreath tPssrSafetyBreath) {
+        if (tPssrSafetyBreath.getConfirmer1().equals(tPssrSafetyBreath.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrSafetyBreathMapper.updateTPssrSafetyBreathByIds(tPssrSafetyBreath));
     }
     /**

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

@@ -279,6 +279,9 @@ public class TPssrSafetyBrustController extends BaseController {
     @Log(title = "安全设施-爆破片", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyBrust tPssrSafetyBrust) {
+        if (tPssrSafetyBrust.getConfirmer1().equals(tPssrSafetyBrust.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrSafetyBrust.getFileIds(), "aqss-bt", tPssrSafetyBrust.getId(), tPssrSafetyBrust.getSubId());
         return toAjax(tPssrSafetyBrustService.updateTPssrSafetyBrust(tPssrSafetyBrust));
     }
@@ -290,6 +293,9 @@ public class TPssrSafetyBrustController extends BaseController {
     @Log(title = "安全设施-爆破片", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrSafetyBrust tPssrSafetyBrust) {
+        if (tPssrSafetyBrust.getConfirmer1().equals(tPssrSafetyBrust.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrSafetyBrustMapper.updateTPssrSafetyBrustByIds(tPssrSafetyBrust));
     }
     /**

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

@@ -267,6 +267,9 @@ public class TPssrSafetyFlamearresterController extends BaseController {
     @Log(title = "安全设施-阻火器", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyFlamearrester tPssrSafetyFlamearrester) {
+        if (tPssrSafetyFlamearrester.getConfirmer1().equals(tPssrSafetyFlamearrester.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrSafetyFlamearrester.getFileIds(), "aqss-f", tPssrSafetyFlamearrester.getId(), tPssrSafetyFlamearrester.getSubId());
         return toAjax(tPssrSafetyFlamearresterService.updateTPssrSafetyFlamearrester(tPssrSafetyFlamearrester));
     }
@@ -278,6 +281,9 @@ public class TPssrSafetyFlamearresterController extends BaseController {
     @Log(title = "安全设施-阻火器", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrSafetyFlamearrester tPssrSafetyFlamearrester) {
+        if (tPssrSafetyFlamearrester.getConfirmer1().equals(tPssrSafetyFlamearrester.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrSafetyFlamearresterMapper.updateTPssrSafetyFlamearresterByIds(tPssrSafetyFlamearrester));
     }
 

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

@@ -181,6 +181,9 @@ public class TPssrSafetyValveController extends BaseController {
     @Log(title = "安全设施-安全阀", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrSafetyValve tPssrSafetyValve) {
+        if (tPssrSafetyValve.getConfirmer1().equals(tPssrSafetyValve.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrSafetyValve.getFileIds(), "aqss-v", tPssrSafetyValve.getId(), tPssrSafetyValve.getSubId());
         return toAjax(tPssrSafetyValveService.updateTPssrSafetyValve(tPssrSafetyValve));
     }
@@ -192,6 +195,9 @@ public class TPssrSafetyValveController extends BaseController {
     @Log(title = "安全设施-安全阀", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrSafetyValve tPssrSafetyValve) {
+        if (tPssrSafetyValve.getConfirmer1().equals(tPssrSafetyValve.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrSafetyValveMapper.updateTPssrSafetyValveByIds(tPssrSafetyValve));
     }
     /**

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

@@ -193,6 +193,9 @@ public class TPssrTorchvocController extends BaseController {
     @Log(title = "火炬，VOC系统", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrTorchvoc tPssrTorchvoc) {
+        if (tPssrTorchvoc.getConfirm1().equals(tPssrTorchvoc.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrTorchvoc.getFileIds(), "hbss", tPssrTorchvoc.getId(), tPssrTorchvoc.getSubId());
         return toAjax(tPssrTorchvocService.updateTPssrTorchvoc(tPssrTorchvoc));
     }
@@ -204,6 +207,9 @@ public class TPssrTorchvocController extends BaseController {
     @Log(title = "火炬，VOC系统", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrTorchvoc tPssrTorchvoc) {
+        if (tPssrTorchvoc.getConfirm1().equals(tPssrTorchvoc.getConfirm2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         return toAjax(tPssrTorchvocMapper.updateTPssrTorchvocByIds(tPssrTorchvoc));
     }
     /**

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

@@ -203,6 +203,9 @@ public class TPssrVesselController extends BaseController {
     @Log(title = "压力容器", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrVessel tPssrVessel) {
+        if (tPssrVessel.getConfirmer1().equals(tPssrVessel.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         tPssrFileService.updateFileRelevance(tPssrVessel.getFileIds(), "ylrq", tPssrVessel.getId(), tPssrVessel.getSubId());
         return toAjax(tPssrVesselService.updateTPssrVessel(tPssrVessel));
     }
@@ -224,6 +227,9 @@ public class TPssrVesselController extends BaseController {
     @Log(title = "压力容器修改", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editBatch(@RequestBody TPssrVessel tPssrVessel) {
+        if (tPssrVessel.getConfirmer1().equals(tPssrVessel.getConfirmer2())){
+            return AjaxResult.error("确认人不能为同一人，请重新选择！");
+        }
         logger.info(JSON.toJSONString(tPssrVessel));
         return toAjax(tPssrVesselService.updateTPssrVesselByIds(tPssrVessel));
     }
@@ -243,7 +249,7 @@ public class TPssrVesselController extends BaseController {
         if (StringUtils.isNotEmpty(subcontent.getUnit())) {
             for (String unit : subcontent.getUnit().split(",")) {
                 tSpecdevYlrq.setPlantCode("BCC");
-                tSpecdevYlrq.setDevno("-" + unit);
+                tSpecdevYlrq.setDevno(unit + "-");
                 for (TSpecdevYlrq t : tSpecdevYlrqMapper.selectTSpecdevYlrqListForPssr(tSpecdevYlrq)) {
                     TPssrVessel vessel = new TPssrVessel();
                     vessel.setUnit(unit);

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

@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by createdate desc
+        order by d.createdate desc
     </select>
     
     <select id="selectTPssrAboveallById" parameterType="Long" resultMap="TPssrAboveallResult">

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

@@ -70,6 +70,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrAirtightById" parameterType="Long" resultMap="TPssrAirtightResult">

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

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by createdate desc
     </select>
     
     <select id="selectTPssrAlarmById" parameterType="Long" resultMap="TPssrAlarmResult">

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

@@ -67,6 +67,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrAnalyzerById" parameterType="Long" resultMap="TPssrAnalyzerResult">

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

@@ -117,6 +117,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN in_confirm1 IS NULL AND in_confirm2 IS NULL THEN 0
+        WHEN in_confirm1 IS NULL OR in_confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrBlindById" parameterType="Long" resultMap="TPssrBlindResult">

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

@@ -75,6 +75,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrCircuitById" parameterType="Long" resultMap="TPssrCircuitResult">

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

@@ -65,6 +65,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrCleaningById" parameterType="Long" resultMap="TPssrCleaningResult">

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

@@ -46,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by createdate desc
     </select>
     
     <select id="selectTPssrFileById" parameterType="Long" resultMap="TPssrFileResult">

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

@@ -110,6 +110,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrFrameById" parameterType="Long" resultMap="TPssrFrameResult">

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

@@ -67,7 +67,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by d.serial_number asc
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END, d.serial_number asc
     </select>
 
     <select id="selectTPssrFranklinismById" parameterType="Long" resultMap="TPssrFranklinismResult">

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

@@ -67,6 +67,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrGasdetectorById" parameterType="Long" resultMap="TPssrGasdetectorResult">

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

@@ -59,6 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrHygieneById" parameterType="Long" resultMap="TPssrHygieneResult">

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

@@ -69,6 +69,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrInstrumentCalibrationById" parameterType="Long" resultMap="TPssrInstrumentCalibrationResult">

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

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by createdate desc
     </select>
 
     <select id="selectTPssrInstrumentTestById" parameterType="Long" resultMap="TPssrInstrumentTestResult">

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

@@ -65,6 +65,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrLaboratoryById" parameterType="Long" resultMap="TPssrLaboratoryResult">

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

@@ -69,7 +69,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by d.serial_number asc
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,d.serial_number asc
     </select>
 
     <select id="selectTPssrLightingById" parameterType="Long" resultMap="TPssrLightingResult">

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

@@ -88,6 +88,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN lockeder IS NULL AND confirm IS NULL THEN 0
+        WHEN lockeder IS NULL OR confirm IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrLockById" parameterType="Long" resultMap="TPssrLockResult">

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

@@ -63,6 +63,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrMaterialById" parameterType="Long" resultMap="TPssrMaterialResult">

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

@@ -63,6 +63,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrMaterialRawById" parameterType="Long" resultMap="TPssrMaterialRawResult">

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

@@ -67,6 +67,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrMeasureById" parameterType="Long" resultMap="TPssrMeasureResult">

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

@@ -67,6 +67,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrMocById" parameterType="Long" resultMap="TPssrMocResult">

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

@@ -67,6 +67,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrMotorById" parameterType="Long" resultMap="TPssrMotorResult">

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

@@ -69,6 +69,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrNitrogenById" parameterType="Long" resultMap="TPssrNitrogenResult">

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

@@ -65,6 +65,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirmed_person IS NULL THEN 0
+        ELSE 1
+        END,createdate desc
     </select>
 
     <select id="selectTPssrOverhaulExchangerById" parameterType="Long" resultMap="TPssrOverhaulExchangerResult">

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

@@ -60,6 +60,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN resp_person IS NULL  THEN 0
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrOverhaulFilterById" parameterType="Long" resultMap="TPssrOverhaulFilterResult">

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

@@ -54,6 +54,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirmed_person IS NULL THEN 0
+        ELSE 1
+        END,createdate desc
     </select>
 
     <select id="selectTPssrOverhaulTowerById" parameterType="Long" resultMap="TPssrOverhaulTowerResult">

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

@@ -76,6 +76,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN identifying_person IS NULL THEN 0
+        ELSE 1
+        END,createdate desc
     </select>
 
     <select id="selectTPssrOverhaulValveById" parameterType="Long" resultMap="TPssrOverhaulValveResult">

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

@@ -65,6 +65,12 @@
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
+        WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrPipeById" parameterType="Long" resultMap="TPssrPipeResult">

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

@@ -59,6 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrPowerById" parameterType="Long" resultMap="TPssrPowerResult">

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

@@ -67,6 +67,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrProgrammeById" parameterType="Long" resultMap="TPssrProgrammeResult">

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

@@ -59,6 +59,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrProtectionById" parameterType="Long" resultMap="TPssrProtectionResult">

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

@@ -67,6 +67,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrPublicById" parameterType="Long" resultMap="TPssrPublicResult">

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

@@ -70,6 +70,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
+        WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrPumpCleaningById" parameterType="Long" resultMap="TPssrPumpCleaningResult">

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

@@ -62,6 +62,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
+        WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrPumpFillById" parameterType="Long" resultMap="TPssrPumpFillResult">

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

@@ -58,6 +58,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
+        WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrPumpOverhaulById" parameterType="Long" resultMap="TPssrPumpOverhaulResult">

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

@@ -80,6 +80,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
+        WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrSafetyBleedById" parameterType="Long" resultMap="TPssrSafetyBleedResult">

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

@@ -70,6 +70,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
+        WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrSafetyBreathById" parameterType="Long" resultMap="TPssrSafetyBreathResult">

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

@@ -70,6 +70,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
+        WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrSafetyBrustById" parameterType="Long" resultMap="TPssrSafetyBrustResult">

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

@@ -62,6 +62,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
+        WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrSafetyFlamearresterById" parameterType="Long" resultMap="TPssrSafetyFlamearresterResult">

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

@@ -72,6 +72,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
+        WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrSafetyValveById" parameterType="Long" resultMap="TPssrSafetyValveResult">

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

@@ -65,7 +65,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
-        order by d.serial_number asc
+        order by
+        CASE
+        WHEN confirm1 IS NULL AND confirm2 IS NULL THEN 0
+        WHEN confirm1 IS NULL OR confirm2 IS NULL THEN 1
+        ELSE 2
+        END,
+         d.serial_number asc
     </select>
 
     <select id="selectTPssrTorchvocById" parameterType="Long" resultMap="TPssrTorchvocResult">

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

@@ -66,6 +66,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         <!-- 数据范围过滤 -->
         ${params.dataScope}
+        order by
+        CASE
+        WHEN confirmer1 IS NULL AND confirmer2 IS NULL THEN 0
+        WHEN confirmer1 IS NULL OR confirmer2 IS NULL THEN 1
+        ELSE 2
+        END,createdate desc
     </select>
 
     <select id="selectTPssrVesselById" parameterType="Long" resultMap="TPssrVesselResult">

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

@@ -179,11 +179,10 @@
           <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="Utility consumption quantity" align="center" prop="utilityQuantity"
+      <el-table-column label="公用工程物料" align="center" prop="utilityQuantity"
                        :show-overflow-tooltip="true"/>
-      <el-table-column label="Quantity" align="center" prop="quantity" :show-overflow-tooltip="true"/>
-      <el-table-column label="Unit" align="center" prop="unit" :show-overflow-tooltip="true"/>
-      <el-table-column label="Note" align="center" prop="note" :show-overflow-tooltip="true"/>
+      <el-table-column label="数量" align="center" prop="quantity" :show-overflow-tooltip="true"/>
+      <el-table-column label="单位" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="确认人" align="center" prop="confirm1" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.confirm1Name }}</span>
@@ -238,12 +237,9 @@
     <!-- 添加或修改原料对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="Quantity" prop="quantity">
+        <el-form-item label="数量" prop="quantity">
           <el-input v-model="form.quantity" placeholder="请输入Quantity"/>
         </el-form-item>
-        <el-form-item label="Note" prop="note">
-          <el-input v-model="form.note" placeholder="请输入Note"/>
-        </el-form-item>
         <el-form-item label="确认人" prop="confirm1">
           <el-select v-model="form.confirm1" filterable placeholder="请选择确认人">
             <el-option v-for="user in userOptions"
@@ -335,7 +331,7 @@
     <el-dialog v-dialogDrag :close-on-click-modal="false" :visible.sync="reason.open" append-to-body title="驳回"
                width="1000px">
       <el-table  :data="items" border>
-        <el-table-column label="Utility consumption quantity" align="center" prop="utilityQuantity"
+        <el-table-column label="公用工程物料" align="center" prop="utilityQuantity"
                          :show-overflow-tooltip="true"/>
         <el-table-column label="驳回原因" align="center" prop="reason" :show-overflow-tooltip="true">
           <template slot-scope="scope">

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

@@ -179,11 +179,10 @@
           <el-tag v-if="scope.row.approveStatus==2" type="success">已确认2</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="Raw material" align="center" prop="rawMaterial"
+      <el-table-column label="原料" align="center" prop="rawMaterial"
                        :show-overflow-tooltip="true"/>
-      <el-table-column label="Quantity" align="center" prop="quantity" :show-overflow-tooltip="true"/>
-      <el-table-column label="Unit" align="center" prop="unit" :show-overflow-tooltip="true"/>
-      <el-table-column label="Note" align="center" prop="note" :show-overflow-tooltip="true"/>
+      <el-table-column label="数量" align="center" prop="quantity" :show-overflow-tooltip="true"/>
+      <el-table-column label="单位" align="center" prop="unit" :show-overflow-tooltip="true"/>
       <el-table-column label="确认人" align="center" prop="confirm1" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span>{{ scope.row.confirm1Name }}</span>
@@ -238,39 +237,9 @@
     <!-- 添加或修改原料对话框 -->
     <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="Quantity" prop="quantity">
+        <el-form-item label="数量" prop="quantity">
           <el-input v-model="form.quantity" placeholder="请输入Quantity"/>
         </el-form-item>
-        <el-form-item label="Note" prop="note">
-          <el-input v-model="form.note" placeholder="请输入Note"/>
-        </el-form-item>
-        <el-form-item label="确认人" prop="confirm1">
-          <el-select v-model="form.confirm" filterable placeholder="请选择确认人1">
-            <el-option v-for="user in userOptions"
-                       :label="user.nickName"
-                       :value="user.userId+''"
-                       :key="user.userId"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" placeholder="请输入备注"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 添加或修改原料对话框 -->
-    <el-dialog :close-on-click-modal="false" :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="Quantity" prop="quantity">
-          <el-input v-model="form.quantity" placeholder="请输入Quantity"/>
-        </el-form-item>
-        <el-form-item label="Note" prop="note">
-          <el-input v-model="form.note" placeholder="请输入Note"/>
-        </el-form-item>
         <el-form-item label="确认人" prop="confirm1">
           <el-select v-model="form.confirm1" filterable placeholder="请选择确认人">
             <el-option v-for="user in userOptions"
@@ -302,7 +271,7 @@
                        :key="user.userId"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="时间确认" prop="confirmationDate">
+        <el-form-item label="确认时间" prop="confirmationDate">
           <el-date-picker clearable size="small" style="width: 200px"
                           v-model="form.confirmationDate"
                           type="date"

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

@@ -173,7 +173,7 @@
       </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" width="180"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
 
           <el-button

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

@@ -177,7 +177,7 @@
       </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" width="180"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" v-if="isApprove==0" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
 
           <el-button

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

@@ -173,7 +173,7 @@
       </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" width="180"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" width="120" v-if="isApprove==0" class-name="small-padding fixed-width">
         <template slot-scope="scope">
 
           <el-button

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

@@ -57,16 +57,31 @@
         >导出
         </el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-popover
+          placement="top-start"
+          trigger="hover">
+          <el-table :data="feetList" border>
+            <el-table-column width="50" property="index" label="步骤"></el-table-column>
+            <el-table-column width="500" property="content" label="检查内容"></el-table-column>
+          </el-table>
+          <el-button slot="reference"
+            size="mini"
+            type="success">检查步骤</el-button>
+        </el-popover>
+      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table :span-method="mergeMethod" v-loading="loading" :data="subcontentList" @selection-change="handleSelectionChange"
+    <el-table :span-method="mergeMethod" v-loading="loading" :data="subcontentList"
+              @selection-change="handleSelectionChange"
               :height="ch" border>
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="部门" align="center" prop="deptUnit" :show-overflow-tooltip="true" width="80"/>
-      <el-table-column label="序号" align="center" prop="serialNumber" :show-overflow-tooltip="true" width="80"/>
+      <el-table-column label="序号" align="center" type="index" :show-overflow-tooltip="true" width="80"/>
       <el-table-column label="项目" align="center" prop="item" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="开车条件检查内容" align="center" prop="content" :show-overflow-tooltip="true" width="700"/>
+      <el-table-column label="开车条件检查内容" align="center" prop="content" :show-overflow-tooltip="true"
+                       width="700"/>
       <el-table-column label="审批状态" align="center" prop="approveStatus" width="110">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.pssr_approve_status" :value="scope.row.approveStatus"
@@ -80,7 +95,7 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" width="180"/>
-      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" fixed="right" width="180" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -171,7 +186,6 @@ import {
   importTemplate,
   listSubcontent,
   updateSubcontent,
-  updateSubcontentBatch,
 } from "@/api/pssr/subcontent";
 import {treeselect} from "@/api/system/dept";
 import {getToken} from "@/utils/auth";
@@ -204,8 +218,22 @@ export default {
   },
   data() {
     return {
-      ch :this.clientHeight,
+      ch: this.clientHeight,
       userOptions: [],
+      feetList: [
+        {index:1, content: "机泵、仪表校验"},
+        {index:2, content: "设备清洁度"},
+        {index:3, content: "检修项目、设计变更"},
+        {index:4, content: "开工方案"},
+        {index:5, content: "盲板"},
+        {index:6, content: "锁开锁关阀门状态、短接、安全设施、支(吊)架、压力管道/压力容器"},
+        {index:7, content: "现场卫生、人身防护、消气防设施、通讯监控、便携式检测仪、环保设施"},
+        {index:8, content: "实验室、公用工程、原辅料"},
+        {index:9, content: "气密、氮气置换"},
+        {index:10, content: "电机设备"},
+        {index:11, content: "仪表连锁测试"},
+        {index:12, content: "报警/联锁值确认、临时电源、照明电伴热、静电接地/跨接、气体检测仪、在线分析仪"},
+      ],
       // 遮罩层
       loading: true,
       // 选中数组
@@ -293,7 +321,7 @@ export default {
       this.$confirm('确认驳回？', '提示', {
         confirmButtonText: "确认驳回",
         cancelButtonText: "取消",
-      }).then( () =>{
+      }).then(() => {
         let data = {
           ids: this.ids,
           aboveallId: this.aboveallId

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

@@ -71,10 +71,10 @@
     </div>
     <div v-if="sn=='yfl'">
       <el-tabs v-model="activeName" @tab-click="handleClick">
-        <el-tab-pane label="Cracker commissioning material quantity " name="first">
+        <el-tab-pane label="裂解装置开车物料" name="first">
           <material :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
-        <el-tab-pane label="Raw materials" name="second">
+        <el-tab-pane label="原材料" name="second">
           <material-raw :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
         </el-tab-pane>
       </el-tabs>