PSSR确认人不能相同校验

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -210,7 +211,7 @@ public class TPssrAirtightController extends BaseController {
     @Log(title = "气密", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrAirtight tPssrAirtight) {
-        if (tPssrAirtight.getConfirm1().equals(tPssrAirtight.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrAirtight.getConfirm1())&&tPssrAirtight.getConfirm1().equals(tPssrAirtight.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrAirtight.setApproveStatus(0L);

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -9,7 +10,10 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrAnalyzer;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
 import com.ruoyi.project.pssr.mapper.TPssrAnalyzerMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -259,7 +263,7 @@ public class TPssrAnalyzerController extends BaseController {
     @Log(title = "在线分析仪", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrAnalyzer tPssrAnalyzer) {
-        if (tPssrAnalyzer.getConfirm1().equals(tPssrAnalyzer.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrAnalyzer.getConfirm1())&&tPssrAnalyzer.getConfirm1().equals(tPssrAnalyzer.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrAnalyzer.setApproveStatus(0L);

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

@@ -1,6 +1,7 @@
 package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -81,12 +82,11 @@ public class TPssrBlindController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('pssr:blind: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<TPssrBlind> list = new ArrayList<TPssrBlind>();
@@ -141,9 +141,9 @@ public class TPssrBlindController 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;
@@ -154,16 +154,16 @@ public class TPssrBlindController extends BaseController {
             try {
                 tPssrBlindService.insertTPssrBlind(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));
     }
 
@@ -252,7 +252,7 @@ public class TPssrBlindController extends BaseController {
                 num++;
                 rowIndex++;
             }
-            filename =  "PSSR_04_盲板_" + UUID.randomUUID().toString() + ".xlsx";
+            filename = "PSSR_04_盲板_" + UUID.randomUUID().toString() + ".xlsx";
             out = new FileOutputStream(ExcelUtil.getAbsoluteFile(filename));
             wb.write(out);
             wb.close();
@@ -273,8 +273,8 @@ public class TPssrBlindController extends BaseController {
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         TPssrBlind item = tPssrBlindService.selectTPssrBlindById(id);
         item.setFileList(tPssrFileService.selectTPssrFileListByItem(item.getSubId(), item.getId(), forShort));
-            if (item.getApproveStatus() != 2)
-                item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
+        if (item.getApproveStatus() != 2)
+            item.setReason(tPssrTurndownService.selectTPssrTurndownByItem(item.getSubId(), item.getId(), forShort));
         return AjaxResult.success(item);
     }
 
@@ -285,7 +285,7 @@ public class TPssrBlindController extends BaseController {
     @Log(title = "盲板", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrBlind tPssrBlind) {
-        if (tPssrBlind.getInConfirm1().equals(tPssrBlind.getInConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrBlind.getInConfirm1())&&tPssrBlind.getInConfirm1().equals(tPssrBlind.getInConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrBlind.setApproveStatus(0L);
@@ -299,9 +299,12 @@ public class TPssrBlindController extends BaseController {
     @Log(title = "盲板", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TPssrBlind tPssrBlind) {
-        if (tPssrBlind.getInConfirm1().equals(tPssrBlind.getInConfirm2())){
+        if (tPssrBlind.getInConfirm1().equals(tPssrBlind.getInConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
+        if (StringUtils.isNotEmpty(tPssrBlind.getStartupStatus()) && !tPssrBlind.getStartupStatus().equals(tPssrBlind.getActualStatus())) {
+            tPssrBlind.setSatisfy("✖");
+        }
         tPssrFileService.updateFileRelevance(tPssrBlind.getFileIds(), forShort, tPssrBlind.getId(), tPssrBlind.getSubId());
         return toAjax(tPssrBlindService.updateTPssrBlind(tPssrBlind));
     }
@@ -313,7 +316,7 @@ public class TPssrBlindController extends BaseController {
     @Log(title = "盲板", businessType = BusinessType.UPDATE)
     @PutMapping("/editBatch")
     public AjaxResult editb(@RequestBody TPssrBlind tPssrBlind) {
-        if (tPssrBlind.getInConfirm1().equals(tPssrBlind.getInConfirm2())){
+        if (tPssrBlind.getInConfirm1().equals(tPssrBlind.getInConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         return toAjax(tPssrBlindMapper.updateTPssrBlindByIds(tPssrBlind));
@@ -410,7 +413,7 @@ public class TPssrBlindController extends BaseController {
 
     @PutMapping("/turnDownBlind")
     public AjaxResult turnDownBlind(@RequestBody List<TPssrBlind> tPssrBlind) {
-        if (CollectionUtils.isNotEmpty(tPssrBlind)){
+        if (CollectionUtils.isNotEmpty(tPssrBlind)) {
             String userId = getUserId().toString();
             Long subId = tPssrBlind.get(0).getSubId();
             // 修改已选择数据的状态

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -280,7 +281,7 @@ public class TPssrCircuitController extends BaseController {
     @Log(title = "短接", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrCircuit tPssrCircuit) {
-        if (tPssrCircuit.getConfirm1().equals(tPssrCircuit.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrCircuit.getConfirm1())&&tPssrCircuit.getConfirm1().equals(tPssrCircuit.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrCircuit.setApproveStatus(0L);
@@ -297,6 +298,9 @@ public class TPssrCircuitController extends BaseController {
         if (tPssrCircuit.getConfirm1().equals(tPssrCircuit.getConfirm2())){
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
+        if (StringUtils.isNotEmpty(tPssrCircuit.getRightStatus())&&!tPssrCircuit.getRightStatus().equals(tPssrCircuit.getCurrentStatus())){
+            tPssrCircuit.setCurrentStatusRight("否");
+        }
         tPssrFileService.updateFileRelevance(tPssrCircuit.getFileIds(), "dj", tPssrCircuit.getId(), tPssrCircuit.getSubId());
         return toAjax(tPssrCircuitService.updateTPssrCircuit(tPssrCircuit));
     }

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

@@ -3,8 +3,8 @@ package com.ruoyi.project.pssr.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.google.gson.JsonObject;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -316,7 +316,7 @@ public class TPssrCleaningController extends BaseController {
     @Log(title = "设备清洁", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrCleaning tPssrCleaning) {
-        if (tPssrCleaning.getConfirm1().equals(tPssrCleaning.getConfirm2())) {
+        if (StringUtils.isNotEmpty(tPssrCleaning.getConfirm1())&&tPssrCleaning.getConfirm1().equals(tPssrCleaning.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrCleaning.setCheckContent(JSON.toJSONString(genList(tPssrCleaning.getDevType())));

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -9,7 +10,10 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrFrame;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
 import com.ruoyi.project.pssr.mapper.TPssrFrameMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -269,7 +273,7 @@ public class TPssrFrameController extends BaseController {
     @Log(title = "支（吊）架", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrFrame tPssrFrame) {
-        if (tPssrFrame.getConfirm1().equals(tPssrFrame.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrFrame.getConfirm1())&&tPssrFrame.getConfirm1().equals(tPssrFrame.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrFrame.setApproveStatus(0L);

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -9,7 +10,10 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrFranklinism;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
 import com.ruoyi.project.pssr.mapper.TPssrFranklinismMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -251,7 +255,7 @@ public class TPssrFranklinismController extends BaseController {
     @Log(title = "静电接地，跨接", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrFranklinism tPssrFranklinism) {
-        if (tPssrFranklinism.getConfirm1().equals(tPssrFranklinism.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrFranklinism.getConfirm1())&&tPssrFranklinism.getConfirm1().equals(tPssrFranklinism.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrFranklinism.setApproveStatus(0L);

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -9,7 +10,10 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrGasdetector;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
 import com.ruoyi.project.pssr.mapper.TPssrGasdetectorMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -257,7 +261,7 @@ public class TPssrGasdetectorController extends BaseController {
     @Log(title = "气体检测器", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrGasdetector tPssrGasdetector) {
-        if (tPssrGasdetector.getConfirm1().equals(tPssrGasdetector.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrGasdetector.getConfirm1())&&tPssrGasdetector.getConfirm1().equals(tPssrGasdetector.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrGasdetector.setApproveStatus(0L);

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -246,7 +247,7 @@ public class TPssrHygieneController extends BaseController {
     @Log(title = "现场卫生", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrHygiene tPssrHygiene) {
-        if (tPssrHygiene.getConfirm1().equals(tPssrHygiene.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrHygiene.getConfirm1())&&tPssrHygiene.getConfirm1().equals(tPssrHygiene.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrHygiene.setApproveStatus(0L);

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -9,7 +10,10 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrInstrumentCalibration;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
 import com.ruoyi.project.pssr.mapper.TPssrInstrumentCalibrationMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -260,7 +264,7 @@ public class TPssrInstrumentCalibrationController extends BaseController {
     @Log(title = "仪表校验", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrInstrumentCalibration tPssrInstrumentCalibration) {
-        if (tPssrInstrumentCalibration.getConfirm1().equals(tPssrInstrumentCalibration.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrInstrumentCalibration.getConfirm1())&&tPssrInstrumentCalibration.getConfirm1().equals(tPssrInstrumentCalibration.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrInstrumentCalibration.setApproveStatus(0L);

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -255,7 +256,7 @@ public class TPssrLaboratoryController extends BaseController {
     @Log(title = "实验室", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrLaboratory tPssrLaboratory) {
-        if (tPssrLaboratory.getConfirm1().equals(tPssrLaboratory.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrLaboratory.getConfirm1())&&tPssrLaboratory.getConfirm1().equals(tPssrLaboratory.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrLaboratory.setApproveStatus(0L);

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

@@ -1,6 +1,7 @@
 package com.ruoyi.project.pssr.controller;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -180,7 +181,7 @@ public class TPssrLightingController extends BaseController {
     @Log(title = "照明", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrLighting tPssrLighting) {
-        if (tPssrLighting.getConfirm1().equals(tPssrLighting.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrLighting.getConfirm1())&&tPssrLighting.getConfirm1().equals(tPssrLighting.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrLighting.setApproveStatus(0L);

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

@@ -287,7 +287,7 @@ public class TPssrMaterialController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrMaterial tPssrMaterial) {
-        if (tPssrMaterial.getConfirm1().equals(tPssrMaterial.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrMaterial.getConfirm1())&&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,7 +106,7 @@ public class TPssrMaterialRawController extends BaseController {
     @Log(title = "原料", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrMaterialRaw tPssrMaterialRaw) {
-        if (tPssrMaterialRaw.getConfirm1().equals(tPssrMaterialRaw.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrMaterialRaw.getConfirm1())&&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,7 +272,7 @@ public class TPssrMeasureController extends BaseController {
     @Log(title = "人身防护", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrMeasure tPssrMeasure) {
-        if (tPssrMeasure.getConfirm1().equals(tPssrMeasure.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrMeasure.getConfirm1())&&tPssrMeasure.getConfirm1().equals(tPssrMeasure.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrMeasure.setApproveStatus(0L);

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

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

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -9,7 +10,10 @@ import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.pssr.domain.*;
+import com.ruoyi.project.pssr.domain.TPssrApprove;
+import com.ruoyi.project.pssr.domain.TPssrMotor;
+import com.ruoyi.project.pssr.domain.TPssrSubcontent;
+import com.ruoyi.project.pssr.domain.TPssrTurndown;
 import com.ruoyi.project.pssr.mapper.TPssrMotorMapper;
 import com.ruoyi.project.pssr.service.*;
 import com.ruoyi.project.system.domain.SysDept;
@@ -258,7 +262,7 @@ public class TPssrMotorController extends BaseController {
     @Log(title = "电机设备", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrMotor tPssrMotor) {
-        if (tPssrMotor.getConfirm1().equals(tPssrMotor.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrMotor.getConfirm1())&&tPssrMotor.getConfirm1().equals(tPssrMotor.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrMotor.setApproveStatus(0L);

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

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

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

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

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

@@ -1,6 +1,7 @@
 package com.ruoyi.project.pssr.controller;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -174,7 +175,7 @@ public class TPssrPowerController extends BaseController {
     @Log(title = "临时电源", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrPower tPssrPower) {
-        if (tPssrPower.getConfirm1().equals(tPssrPower.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrPower.getConfirm1())&&tPssrPower.getConfirm1().equals(tPssrPower.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrPower.setApproveStatus(0L);

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

@@ -1,5 +1,6 @@
 package com.ruoyi.project.pssr.controller;
 
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.file.FileUploadUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -170,7 +171,7 @@ public class TPssrProgrammeController extends BaseController {
     @Log(title = "开工方案", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrProgramme tPssrProgramme) {
-        if (tPssrProgramme.getConfirm1().equals(tPssrProgramme.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrProgramme.getConfirm1())&&tPssrProgramme.getConfirm1().equals(tPssrProgramme.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         return toAjax(tPssrProgrammeService.insertTPssrProgramme(tPssrProgramme));

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

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

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

@@ -1,6 +1,7 @@
 package com.ruoyi.project.pssr.controller;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -168,7 +169,7 @@ public class TPssrPublicController extends BaseController {
     @Log(title = "公用工程", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrPublic tPssrPublic) {
-        if (tPssrPublic.getConfirm1().equals(tPssrPublic.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrPublic.getConfirm1())&&tPssrPublic.getConfirm1().equals(tPssrPublic.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrPublic.setApproveStatus(0L);

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

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

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

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

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

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

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -268,7 +269,7 @@ public class TPssrSafetyBleedController extends BaseController {
     @Log(title = "安全设施-紧急泄放阀", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrSafetyBleed tPssrSafetyBleed) {
-        if (tPssrSafetyBleed.getConfirmer1().equals(tPssrSafetyBleed.getConfirmer2())){
+        if (StringUtils.isNotEmpty(tPssrSafetyBleed.getConfirmer1())&&tPssrSafetyBleed.getConfirmer1().equals(tPssrSafetyBleed.getConfirmer2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyBleed.setApproveStatus(0L);

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -268,7 +269,7 @@ public class TPssrSafetyBreathController extends BaseController {
     @Log(title = "安全设施-呼吸阀", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrSafetyBreath tPssrSafetyBreath) {
-        if (tPssrSafetyBreath.getConfirmer1().equals(tPssrSafetyBreath.getConfirmer2())){
+        if (StringUtils.isNotEmpty(tPssrSafetyBreath.getConfirmer1())&&tPssrSafetyBreath.getConfirmer1().equals(tPssrSafetyBreath.getConfirmer2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyBreath.setApproveStatus(0L);

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -268,7 +269,7 @@ public class TPssrSafetyBrustController extends BaseController {
     @Log(title = "安全设施-爆破片", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrSafetyBrust tPssrSafetyBrust) {
-        if (tPssrSafetyBrust.getConfirmer1().equals(tPssrSafetyBrust.getConfirmer2())){
+        if (StringUtils.isNotEmpty(tPssrSafetyBrust.getConfirmer1())&&tPssrSafetyBrust.getConfirmer1().equals(tPssrSafetyBrust.getConfirmer2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyBrust.setApproveStatus(0L);

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

@@ -2,6 +2,7 @@ package com.ruoyi.project.pssr.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -256,7 +257,7 @@ public class TPssrSafetyFlamearresterController extends BaseController {
     @Log(title = "安全设施-阻火器", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrSafetyFlamearrester tPssrSafetyFlamearrester) {
-        if (tPssrSafetyFlamearrester.getConfirmer1().equals(tPssrSafetyFlamearrester.getConfirmer2())){
+        if (StringUtils.isNotEmpty(tPssrSafetyFlamearrester.getConfirmer1())&&tPssrSafetyFlamearrester.getConfirmer1().equals(tPssrSafetyFlamearrester.getConfirmer2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyFlamearrester.setApproveStatus(0L);

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

@@ -1,6 +1,7 @@
 package com.ruoyi.project.pssr.controller;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -195,7 +196,7 @@ public class TPssrSafetyValveController extends BaseController {
     @Log(title = "安全设施-安全阀", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrSafetyValve tPssrSafetyValve) {
-        if (tPssrSafetyValve.getConfirmer1().equals(tPssrSafetyValve.getConfirmer2())) {
+        if (StringUtils.isNotEmpty(tPssrSafetyValve.getConfirmer1())&&tPssrSafetyValve.getConfirmer1().equals(tPssrSafetyValve.getConfirmer2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrSafetyValve.setApproveStatus(0L);

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

@@ -1,6 +1,7 @@
 package com.ruoyi.project.pssr.controller;
 
 import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -182,7 +183,7 @@ public class TPssrTorchvocController extends BaseController {
     @Log(title = "火炬，VOC系统", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TPssrTorchvoc tPssrTorchvoc) {
-        if (tPssrTorchvoc.getConfirm1().equals(tPssrTorchvoc.getConfirm2())){
+        if (StringUtils.isNotEmpty(tPssrTorchvoc.getConfirm1())&&tPssrTorchvoc.getConfirm1().equals(tPssrTorchvoc.getConfirm2())) {
             return AjaxResult.error("确认人不能为同一人，请重新选择！");
         }
         tPssrTorchvoc.setApproveStatus(0L);

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

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

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrBlindServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.project.pssr.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.pssr.mapper.TPssrBlindMapper;
@@ -57,6 +59,9 @@ public class TPssrBlindServiceImpl implements ITPssrBlindService
     @Override
     public int insertTPssrBlind(TPssrBlind tPssrBlind)
     {
+        if(StringUtils.isEmpty(tPssrBlind.getActualStatus())&&StringUtils.isNotEmpty(tPssrBlind.getStartupStatus())){
+            tPssrBlind.setActualStatus(tPssrBlind.getStartupStatus());
+        }
         return tPssrBlindMapper.insertTPssrBlind(tPssrBlind);
     }
 

master/src/main/java/com/ruoyi/project/pssr/service/impl/TPssrCircuitServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.project.pssr.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.utils.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.project.pssr.mapper.TPssrCircuitMapper;
@@ -57,6 +59,10 @@ public class TPssrCircuitServiceImpl implements ITPssrCircuitService
     @Override
     public int insertTPssrCircuit(TPssrCircuit tPssrCircuit)
     {
+        if (StringUtils.isEmpty(tPssrCircuit.getCurrentStatus())&&StringUtils.isNotEmpty(tPssrCircuit.getRightStatus())){
+            tPssrCircuit.setCurrentStatus(tPssrCircuit.getRightStatus());
+            tPssrCircuit.setCurrentStatusRight("是");
+        }
         return tPssrCircuitMapper.insertTPssrCircuit(tPssrCircuit);
     }