PSSR:

-添加流程
巡检:
添加重复提交验证

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseBicycleController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -300,6 +301,7 @@ public class TCommonuseBicycleController extends BaseController {
     @PreAuthorize("@ss.hasPermi('commonuse:bicycle:edit')")
     @Log(title = "自行车", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TCommonuseBicycle tCommonuseBicycle) {
         tCommonuseBicycle.setUpdatedate(new Date());
         tCommonuseBicycle.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseDownspoutController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -27,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -287,6 +287,7 @@ public class TCommonuseDownspoutController extends BaseController {
     @PreAuthorize("@ss.hasPermi('commonuse:downspout:edit')")
     @Log(title = "落水管", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TCommonuseDownspout tCommonuseDownspout) {
         tCommonuseDownspout.setUpdatedate(new Date());
         tCommonuseDownspout.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseEarplugController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -27,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -292,6 +292,7 @@ public class TCommonuseEarplugController extends BaseController {
     @PreAuthorize("@ss.hasPermi('commonuse:earplug:edit')")
     @Log(title = "耳塞分配器检查记录", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TCommonuseEarplug tCommonuseEarplug) {
         tCommonuseEarplug.setUpdatedate(new Date());
         tCommonuseEarplug.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseManholeCoverController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -27,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -312,6 +312,7 @@ public class TCommonuseManholeCoverController extends BaseController {
     @PreAuthorize("@ss.hasPermi('commonuse:cover:edit')")
     @Log(title = "地井盖", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TCommonuseManholeCover tCommonuseManholeCover) {
         tCommonuseManholeCover.setUpdatedate(new Date());
         tCommonuseManholeCover.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseMovementController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -29,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -339,6 +339,7 @@ public class TCommonuseMovementController extends BaseController {
     @PreAuthorize("@ss.hasPermi('commonuse:movement:edit')")
     @Log(title = "移动平台及移动梯", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TCommonuseMovement tCommonuseMovement) {
         tCommonuseMovement.setUpdatedate(new Date());
         tCommonuseMovement.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseSafetyBeltController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -297,6 +298,7 @@ public class TCommonuseSafetyBeltController extends BaseController {
     @PreAuthorize("@ss.hasPermi('commonuse:safetyBelt:edit')")
     @Log(title = "安全带", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TCommonuseSafetyBelt tCommonuseSafetyBelt) {
         tCommonuseSafetyBelt.setUpdatedate(new Date());
         tCommonuseSafetyBelt.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseTesterController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -323,6 +324,7 @@ public class TCommonuseTesterController extends BaseController {
     @PreAuthorize("@ss.hasPermi('commonuse:tester:edit')")
     @Log(title = "检测仪检查记录", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TCommonuseTester tCommonuseTester) {
         tCommonuseTester.setUpdatedate(new Date());
         tCommonuseTester.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseWalkieTalkieController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -27,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -294,6 +294,7 @@ public class TCommonuseWalkieTalkieController extends BaseController {
     @PreAuthorize("@ss.hasPermi('commonuse:walkitTalkie:edit')")
     @Log(title = "对讲机", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TCommonuseWalkieTalkie tCommonuseWalkieTalkie) {
         tCommonuseWalkieTalkie.setUpdatedate(new Date());
         tCommonuseWalkieTalkie.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/commonuse/controller/TCommonuseWaterPumpController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -27,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -295,6 +295,7 @@ public class TCommonuseWaterPumpController extends BaseController {
     @PreAuthorize("@ss.hasPermi('commonuse:pump:edit')")
     @Log(title = "水泵接合器", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TCommonuseWaterPump tCommonuseWaterPump) {
         tCommonuseWaterPump.setUpdatedate(new Date());
         tCommonuseWaterPump.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCabinetController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -29,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -463,6 +463,7 @@ public class TEmergencyCabinetController extends BaseController {
     @PreAuthorize("@ss.hasPermi('emergency:cabinet:edit')")
     @Log(title = "应急事故柜", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TEmergencyCabinet tEmergencyCabinet) {
         tEmergencyCabinet.setUpdatedate(new Date());
         tEmergencyCabinet.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCctvController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -291,6 +292,7 @@ public class TEmergencyCctvController extends BaseController {
     @PreAuthorize("@ss.hasPermi('emergency:cctv:edit')")
     @Log(title = "CCTV系统", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TEmergencyCctv tEmergencyCctv) {
         tEmergencyCctv.setUpdatedate(new Date());
         tEmergencyCctv.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyCofferdamController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -27,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -296,6 +296,7 @@ public class TEmergencyCofferdamController extends BaseController {
     @PreAuthorize("@ss.hasPermi('emergency:cofferdam:edit')")
     @Log(title = "蒸汽裂解装置各区域围堰", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TEmergencyCofferdam tEmergencyCofferdam) {
         tEmergencyCofferdam.setUpdatedate(new Date());
         tEmergencyCofferdam.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyEyewashController.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -353,6 +354,7 @@ public class TEmergencyEyewashController extends BaseController {
     @PreAuthorize("@ss.hasPermi('emergency:eyewash:edit')")
     @Log(title = "洗眼器检查记录", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TEmergencyEyewash tEmergencyEyewash) {
         logger.info("=============修改洗眼器检查记录参数：{}", JSON.toJSONString(tEmergencyEyewash));
         tEmergencyEyewash.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/emergency/controller/TEmergencyPagaController.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -296,6 +297,7 @@ public class TEmergencyPagaController extends BaseController {
     @PreAuthorize("@ss.hasPermi('emergency:paga:edit')")
     @Log(title = "PAGA系统", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TEmergencyPaga tEmergencyPaga) {
         tEmergencyPaga.setUpdatedate(new Date());
         tEmergencyPaga.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAlarmController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -327,6 +328,7 @@ public class TFireAlarmController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fire:alarm:edit')")
     @Log(title = "现场可燃气体检测器/火灾报警系统", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TFireAlarm tFireAlarm) {
         tFireAlarm.setUpdatedate(new Date());
         tFireAlarm.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireAnnihilatorController.java

@@ -6,6 +6,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -31,7 +32,6 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -343,6 +343,7 @@ public class TFireAnnihilatorController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fire:annihilator:edit')")
     @Log(title = "手提式/小推车式灭火器/灭火器材箱", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TFireAnnihilator tFireAnnihilator) {
         tFireAnnihilator.setUpdatedate(new Date());
         tFireAnnihilator.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireDoorController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -307,6 +308,7 @@ public class TFireDoorController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fire:door:edit')")
     @Log(title = "常闭式防爆门/防火门", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TFireDoor tFireDoor) {
         tFireDoor.setUpdatedate(new Date());
         tFireDoor.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireGasShieldController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -306,6 +307,7 @@ public class TFireGasShieldController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fire:shield:edit')")
     @Log(title = "CO2气体保护系统", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TFireGasShield tFireGasShield) {
         tFireGasShield.setUpdatedate(new Date());
         tFireGasShield.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireHoseBoxController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -298,6 +299,7 @@ public class TFireHoseBoxController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fire:hoseBox:edit')")
     @Log(title = "消防水带箱检查记录", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TFireHoseBox tFireHoseBox) {
         tFireHoseBox.setUpdatedate(new Date());
         tFireHoseBox.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFirePostFireController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -298,6 +299,7 @@ public class TFirePostFireController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fire:postFire:edit')")
     @Log(title = "地上消火栓检查记录检查记录", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TFirePostFire tFirePostFire) {
         tFirePostFire.setUpdatedate(new Date());
         tFirePostFire.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSandboxController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -291,6 +292,7 @@ public class TFireSandboxController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fire:sandbox:edit')")
     @Log(title = "应急沙箱", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TFireSandbox tFireSandbox) {
         tFireSandbox.setUpdatedate(new Date());
         tFireSandbox.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSprinklerController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -303,6 +304,7 @@ public class TFireSprinklerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fire:sprinkler:edit')")
     @Log(title = "自动喷淋灭火系统检查记录", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TFireSprinkler tFireSprinkler) {
         tFireSprinkler.setUpdatedate(new Date());
         tFireSprinkler.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireStandpipeController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -294,6 +295,7 @@ public class TFireStandpipeController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fire:standpipe:edit')")
     @Log(title = "消防竖管", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TFireStandpipePatrol tFireStandpipe) {
         tFireStandpipe.setUpdatedate(new Date());
         tFireStandpipe.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireSteamCurtainController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -294,6 +295,7 @@ public class TFireSteamCurtainController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fire:curtain:edit')")
     @Log(title = "蒸汽幕检查记录", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TFireSteamCurtain tFireSteamCurtain) {
         tFireSteamCurtain.setUpdatedate(new Date());
         tFireSteamCurtain.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireWaterCannonController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -298,6 +299,7 @@ public class TFireWaterCannonController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fire:cannon:edit')")
     @Log(title = "消防水炮检查记录", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TFireWaterCannon tFireWaterCannon) {
         tFireWaterCannon.setUpdatedate(new Date());
         tFireWaterCannon.setUpdaterCode(getUserId().toString());

master/src/main/java/com/ruoyi/project/patrol/fire/controller/TFireWeathervaneController.java

@@ -5,6 +5,7 @@ import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.framework.aspectj.lang.annotation.Log;
 import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.interceptor.annotation.RepeatSubmit;
 import com.ruoyi.framework.web.controller.BaseController;
 import com.ruoyi.framework.web.domain.AjaxResult;
 import com.ruoyi.framework.web.page.TableDataInfo;
@@ -29,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.file.Files;
@@ -335,6 +335,7 @@ public class TFireWeathervaneController extends BaseController {
     @PreAuthorize("@ss.hasPermi('fire:weathervane:edit')")
     @Log(title = "风向标/风向袋/新风系统正压计", businessType = BusinessType.UPDATE)
     @PutMapping
+    @RepeatSubmit
     public AjaxResult edit(@RequestBody TFireWeathervane tFireWeathervane) {
         tFireWeathervane.setUpdatedate(new Date());
         tFireWeathervane.setUpdaterCode(getUserId().toString());

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

@@ -225,7 +225,7 @@ public class TPssrApproveController extends BaseController {
         String userId = getUserId().toString();
 
         String condition = devTask.getCondition();
-        if (condition.equals("1")) {
+        if (condition.equals("0")) {
             approve.setApproveStatus(2L);
             TPssrSubcontent tPssrSubcontent = new TPssrSubcontent();
             tPssrSubcontent.setId(approve.getSubId());
@@ -233,7 +233,8 @@ public class TPssrApproveController extends BaseController {
             tPssrSubcontentService.updateTPssrSubcontent(tPssrSubcontent);
             tPssrApproveService.updateTPssrApprove(approve);
         }else{
-            // todo驳回操作，修改子表状态
+            // 驳回操作，修改子表状态
+            handleTurnDown(approve.getSubId(),condition);
         }
         //处理流程节点
         Map<String, Object> param = new HashMap<>();
@@ -246,6 +247,81 @@ public class TPssrApproveController extends BaseController {
         return AjaxResult.success();
     }
 
+    public void handleTurnDown(Long subId,String condition){
+        TPssrSubcontent subcontent = tPssrSubcontentService.selectTPssrSubcontentById(subId);
+        switch (subcontent.getSerialNumber()) {
+            case "01":
+                break;
+            case "02":
+                break;
+            case "03":
+                break;
+            case "04":
+                break;
+            case "05":
+                break;
+            case "06":
+                break;
+            case "07":
+                break;
+            case "08":
+                break;
+            case "09":
+                break;
+            case "10":
+                break;
+            case "11":
+                break;
+            case "12":
+                break;
+            case "13":
+                break;
+            case "14":
+                break;
+            case "15":
+                break;
+            case "16":
+                break;
+            case "17":
+                TPssrLock lock = new TPssrLock();
+                lock.setApproveStatus(2L);
+                lock.setSubId(subId);
+                for (TPssrLock tPssrLock : tPssrLockService.selectTPssrLockList(lock)) {
+                    if("1".equals(condition)){
+                        tPssrLock.setApproveStatus(1L);
+                    } else if ("2".equals(condition)) {
+                        tPssrLock.setApproveStatus(3L);
+                    } else if ("3".equals(condition)) {
+                        tPssrLock.setApproveStatus(4L);
+                    }
+                    tPssrLockService.updateTPssrLock(tPssrLock);
+                }
+                break;
+            case "18":
+                break;
+            case "19":
+                break;
+            case "20":
+                break;
+            case "21":
+                break;
+            case "22":
+                break;
+            case "23":
+                break;
+            case "24":
+                break;
+            case "25":
+                break;
+            case "26":
+                break;
+            case "27":
+                break;
+            case "28":
+                break;
+        }
+    }
+
     /**
      * 子项内容确认
      */
@@ -261,7 +337,7 @@ public class TPssrApproveController extends BaseController {
 
         //处理流程节点
         Map<String, Object> param = new HashMap<>();
-        param.put("condition", "1");
+        param.put("condition", "0");
         //认领任务
         processEngine.getTaskService().claim(taskId, userId);
         taskService.addComment(taskId, processInstancesId, "通过");
@@ -348,61 +424,22 @@ public class TPssrApproveController extends BaseController {
             approve.setProcessId(pi.getProcessInstanceId());
             tPssrApproveService.updateTPssrApprove(approve);
         } else {
-            //有审批数据，
+            // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
-            String processInstancesId = approve.getProcessId();
-            ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
-            TaskService taskService = processEngine.getTaskService();
-            List<Task> tasks = processEngine.getTaskService()//获取任务service
-                    .createTaskQuery()//创建查询对象
-                    .processInstanceId(processInstancesId).list();
-
-            //处理流程节点
-            if (tasks.size() == 1) {
-                String taskId = tasks.get(0).getId();
-                String taskName = tasks.get(0).getName();
-                Map<String, Object> param = new HashMap<>();
-                if (taskName.equals("确认人")) {
-                    param.put("condition", "1");
-                    taskService.addComment(taskId, processInstancesId, "发起新确认流程");
-                    taskService.complete(taskId, param);
-                    Task task = processEngine.getTaskService()//获取任务service
-                            .createTaskQuery()//创建查询对象
-                            .processInstanceId(processInstancesId).singleResult();
-                    param.put("condition", "0");
-                    param.put("confirmUsers", Arrays.asList(confirmers.split(",")));
-                    //认领任务
-//                    processEngine.getTaskService().claim(taskId, userId);
-                    taskService.addComment(task.getId(), processInstancesId, "发起新确认流程");
-                    taskService.complete(task.getId(), param);
-                } else {
-                    param.put("condition", "0");
-                    param.put("confirmUsers", Arrays.asList(confirmers.split(",")));
-                    //认领任务
-//                    processEngine.getTaskService().claim(taskId, userId);
-                    taskService.complete(taskId, param);
-                }
-            } else {
-                for (Task task : tasks) {
-                    Map<String, Object> param = new HashMap<>();
-                    param.put("condition", "1");
-                    taskService.addComment(task.getId(), processInstancesId, "发起新确认流程");
-                    taskService.complete(task.getId(), param);
-                }
-                Task task = processEngine.getTaskService()//获取任务service
-                        .createTaskQuery()//创建查询对象
-                        .processInstanceId(processInstancesId).singleResult();
-
-                Map<String, Object> param = new HashMap<>();
-                param.put("condition", "0");
-                param.put("confirmUsers", Arrays.asList(confirmers.split(",")));
-                //认领任务
-//                    processEngine.getTaskService().claim(taskId, userId);
-                taskService.addComment(task.getId(), processInstancesId, "发起新确认流程");
-                taskService.complete(task.getId(), param);
-            }
+            runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr1confirm");
+            historyService.deleteHistoricProcessInstance(approve.getProcessId());
 
-            approve.setApproveStatus(1L);
+            // 开始申请流程
+            long businessKey = approve.getApproveId();
+            //开始工作流、监听
+            Authentication.setAuthenticatedUserId(userId);//设置当前申请人
+            Map<String, Object> variables = new HashMap<>();
+            variables.put("applyUser", userId);
+            variables.put("confirmUsers", Arrays.asList(confirmers.split(",")));
+            variables.put("chargePerson", sub.getConfirm());
+            //采用key来启动流程定义并设置流程变量，返回流程实例
+            ProcessInstance pi = runtimeService.startProcessInstanceByKey("pssr1confirm", String.valueOf(businessKey), variables);
+            approve.setProcessId(pi.getProcessInstanceId());
             tPssrApproveService.updateTPssrApprove(approve);
         }
     }
@@ -566,7 +603,11 @@ public class TPssrApproveController extends BaseController {
         }else{
             // 已存在流程时，删除旧流程，重新发起
             TPssrApprove approve = tPssrApproves.get(0);
-            runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr3confirm");
+            try {
+                runtimeService.deleteProcessInstance(approve.getProcessId(), "pssr3confirm");
+            } catch (Exception e) {
+                logger.info("无运行时流程");
+            }
             historyService.deleteHistoricProcessInstance(approve.getProcessId());
 
             tPssrLock = new TPssrLock();

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

@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -94,24 +95,35 @@ public class TPssrLockController extends BaseController {
     public AjaxResult confirmLock(@RequestBody TPssrLock tPssrLock) {
         long queryStatus = 0;
         long approveStatus = 0;
+        Date date = null;
         if (tPssrLock.getTaskType() == 4) {
             //拆锁确认
             queryStatus = 1;
             approveStatus = 3;
+            date = new Date();
         } else if (tPssrLock.getTaskType() == 5) {
             //上锁确认
             queryStatus = 3;
             approveStatus = 4;
+            date = new Date();
         } else if (tPssrLock.getTaskType() == 6) {
             //确认人确认
             queryStatus = 4;
             approveStatus = 2;
+            date = new Date();
         }
         // 修改锁开锁关状态
         if (tPssrLock.getIds() != null && tPssrLock.getIds().length > 0) {
             for (Long id : tPssrLock.getIds()) {
                 TPssrLock item = tPssrLockService.selectTPssrLockById(id);
                 item.setApproveStatus(approveStatus);
+                if (item.getUnlockDate()==null) {
+                    item.setUnlockDate(date);
+                } else if (item.getLockedDate()==null) {
+                    item.setLockedDate(date);
+                } else if (item.getConfirmationDate()==null) {
+                    item.setConfirmationDate(date);
+                }
                 tPssrLockService.updateTPssrLock(item);
             }
         } else {
@@ -119,6 +131,13 @@ public class TPssrLockController extends BaseController {
             lock.setSubId(tPssrLock.getSubId());
             lock.setApproveStatus(queryStatus);
             for (TPssrLock item : tPssrLockService.selectTPssrLockList(lock)) {
+                if (item.getUnlockDate()==null) {
+                    item.setUnlockDate(date);
+                } else if (item.getLockedDate()==null) {
+                    item.setLockedDate(date);
+                } else if (item.getConfirmationDate()==null) {
+                    item.setConfirmationDate(date);
+                }
                 item.setApproveStatus(approveStatus);
                 tPssrLockService.updateTPssrLock(item);
             }

master/src/main/resources/processes/pssr/pssr1confirm.bpmn

@@ -4,33 +4,20 @@
     <startEvent id="applyUser" name="Start" activiti:initiator="${applyUser}"></startEvent>
     <sequenceFlow id="flow1" sourceRef="applyUser" targetRef="confirmUser"></sequenceFlow>
     <userTask id="chargePerson" name="检查内容负责人" activiti:assignee="#{chargePerson}"></userTask>
-
     <userTask id="confirmUser" name="确认人" activiti:assignee="${confirmUser}">
         <extensionElements>
             <!-- 定义多实例任务，使用集合变量 confirmUsers 动态生成 -->
             <activiti:multiInstanceLoopCharacteristics isSequential="false" activiti:collection="confirmUsers" activiti:elementVariable="confirmUser">
                 <completionCondition>${nrOfCompletedInstances == nrOfInstances}</completionCondition>
             </activiti:multiInstanceLoopCharacteristics>
-
         </extensionElements>
     </userTask>
-
-
-    <sequenceFlow id="flow2" sourceRef="confirmUser" targetRef="chargePerson">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
-    </sequenceFlow>
+    <sequenceFlow id="flow2" sourceRef="confirmUser" targetRef="chargePerson"></sequenceFlow>
     <sequenceFlow id="flow3" sourceRef="chargePerson" targetRef="confirmUser">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
-    </sequenceFlow>
-    <userTask id="stoped" name="流程挂起"></userTask>
-    <sequenceFlow id="flow5" sourceRef="chargePerson" targetRef="stoped">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
-    <endEvent id="endevent2" name="End"></endEvent>
-    <sequenceFlow id="flow6" sourceRef="stoped" targetRef="endevent2">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="flow7" sourceRef="stoped" targetRef="confirmUser">
+    <endEvent id="endevent1" name="End"></endEvent>
+    <sequenceFlow id="flow4" sourceRef="chargePerson" targetRef="endevent1">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
     </sequenceFlow>
   </process>
@@ -45,11 +32,8 @@
       <bpmndi:BPMNShape bpmnElement="confirmUser" id="BPMNShape_confirmUser">
         <omgdc:Bounds height="55.0" width="105.0" x="240.0" y="240.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="stoped" id="BPMNShape_stoped">
-        <omgdc:Bounds height="55.0" width="105.0" x="540.0" y="240.0"></omgdc:Bounds>
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape bpmnElement="endevent2" id="BPMNShape_endevent2">
-        <omgdc:Bounds height="35.0" width="35.0" x="690.0" y="250.0"></omgdc:Bounds>
+      <bpmndi:BPMNShape bpmnElement="endevent1" id="BPMNShape_endevent1">
+        <omgdc:Bounds height="35.0" width="35.0" x="540.0" y="250.0"></omgdc:Bounds>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge bpmnElement="flow1" id="BPMNEdge_flow1">
         <omgdi:waypoint x="195.0" y="267.0"></omgdi:waypoint>
@@ -66,21 +50,10 @@
         <omgdi:waypoint x="292.0" y="353.0"></omgdi:waypoint>
         <omgdi:waypoint x="292.0" y="295.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow5" id="BPMNEdge_flow5">
+      <bpmndi:BPMNEdge bpmnElement="flow4" id="BPMNEdge_flow4">
         <omgdi:waypoint x="495.0" y="267.0"></omgdi:waypoint>
         <omgdi:waypoint x="540.0" y="267.0"></omgdi:waypoint>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow6" id="BPMNEdge_flow6">
-        <omgdi:waypoint x="645.0" y="267.0"></omgdi:waypoint>
-        <omgdi:waypoint x="690.0" y="267.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge bpmnElement="flow7" id="BPMNEdge_flow7">
-        <omgdi:waypoint x="592.0" y="240.0"></omgdi:waypoint>
-        <omgdi:waypoint x="592.0" y="187.0"></omgdi:waypoint>
-        <omgdi:waypoint x="442.0" y="187.0"></omgdi:waypoint>
-        <omgdi:waypoint x="292.0" y="187.0"></omgdi:waypoint>
-        <omgdi:waypoint x="292.0" y="240.0"></omgdi:waypoint>
-      </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </definitions>

master/src/main/resources/processes/pssr/pssr2confirm.bpmn

@@ -19,19 +19,15 @@
                 </activiti:multiInstanceLoopCharacteristics>
             </extensionElements>
         </userTask>
-    <sequenceFlow id="flow2" sourceRef="confirmUser1" targetRef="confirmUser2">
-   <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
-    </sequenceFlow>
+    <sequenceFlow id="flow2" sourceRef="confirmUser1" targetRef="confirmUser2"></sequenceFlow>
     <userTask id="chargePerson" name="检查内容负责人" activiti:assignee="#{chargePerson}"></userTask>
-    <sequenceFlow id="flow3" sourceRef="confirmUser2" targetRef="chargePerson">
-    <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
-    </sequenceFlow>
+    <sequenceFlow id="flow3" sourceRef="confirmUser2" targetRef="chargePerson"></sequenceFlow>
     <endEvent id="endevent1" name="End"></endEvent>
     <sequenceFlow id="flow4" sourceRef="chargePerson" targetRef="endevent1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="flow5" sourceRef="chargePerson" targetRef="confirmUser1">
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="flow6" sourceRef="chargePerson" targetRef="confirmUser2">
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 2}]]></conditionExpression>

master/src/main/resources/processes/pssr/pssr3confirm.bpmn

@@ -33,20 +33,20 @@
     <sequenceFlow id="flow4" sourceRef="confirmUser3" targetRef="chargePerson"></sequenceFlow>
     <endEvent id="endevent1" name="End"></endEvent>
     <sequenceFlow id="flow5" sourceRef="chargePerson" targetRef="endevent1">
-      <documentation>${condition == 1}</documentation>
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
-    </sequenceFlow>
-    <sequenceFlow id="flow6" sourceRef="chargePerson" targetRef="confirmUser3">
       <documentation>${condition == 0}</documentation>
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 0}]]></conditionExpression>
     </sequenceFlow>
+    <sequenceFlow id="flow6" sourceRef="chargePerson" targetRef="confirmUser3">
+      <documentation>${condition == 3}</documentation>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 3}]]></conditionExpression>
+    </sequenceFlow>
     <sequenceFlow id="flow7" sourceRef="chargePerson" targetRef="confirmUser2">
       <documentation>${condition == 2}</documentation>
       <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 2}]]></conditionExpression>
     </sequenceFlow>
     <sequenceFlow id="flow8" sourceRef="chargePerson" targetRef="confirmUser1">
-      <documentation>${condition == 3}</documentation>
-      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 3}]]></conditionExpression>
+      <documentation>${condition == 1}</documentation>
+      <conditionExpression xsi:type="tFormalExpression"><![CDATA[${condition == 1}]]></conditionExpression>
     </sequenceFlow>
   </process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_pssr3confirm">

ui/src/views/approve/approveDetail/pssrApprove-detail.vue

@@ -3,15 +3,17 @@
              :title="!this.taskForm.taskId == '' ? $t('处理') : $t('详情')"
              :visible.sync="visible"
              :append-to-body="true"
-             width="60%">
-    <Subitem :sub-id="Number(subId)" :serial-number="sn" :is-approve="isApprove"/>
+             width="60%" :close="this.$emit('refreshDataList')">
+    <Subitem :sub-id="Number(subId)" :serial-number="sn" :is-approve="isApprove" @refreshHisList="afterConfirm"/>
     <span slot="footer" class="dialog-footer">
       <el-button v-if="!this.taskForm.taskId == ''&&isApprove==2" type="primary"
-                 @click="dataFormSubmit(1)" :disabled="submitDisabled">通过</el-button>
-      <el-button v-if="!this.taskForm.taskId == ''&&isApprove==2&&this.taskForm.processName.includes('盲板')" type="danger"
-                 @click="dataFormSubmit(0)" :disabled="submitDisabled">驳回安装</el-button>
-      <el-button v-if="!this.taskForm.taskId == ''&&isApprove==2&&this.taskForm.processName.includes('盲板')" type="danger"
-                 @click="dataFormSubmit(2)" :disabled="submitDisabled">驳回拆除</el-button>
+                 @click="dataFormSubmit(0)" >通过</el-button>
+      <el-button v-if="!this.taskForm.taskId == ''&&isApprove==2" type="danger"
+                 @click="dataFormSubmit(1)" >驳回至确认人1</el-button>
+      <el-button v-if="!this.taskForm.taskId == ''&&isApprove==2" type="danger"
+                 @click="dataFormSubmit(2)" >驳回至确认人2</el-button>
+      <el-button v-if="!this.taskForm.taskId == ''&&isApprove==2" type="danger"
+                 @click="dataFormSubmit(3)" >驳回至确认人3</el-button>
       <el-button @click="visible = false">{{ $t('返回') }}</el-button>
     </span>
     <div>
@@ -35,7 +37,7 @@
 import {getHistorylist} from "@/api/ehs/approvedanger";
 import Subitem from "@/views/pssr/subitem/index.vue";
 import {getSubcontent} from "@/api/pssr/subcontent";
-import {getApprove, handlePssrApprove, listApprove} from "@/api/pssr/approve";
+import {handlePssrApprove, listApprove} from "@/api/pssr/approve";
 
 export default {
   name: "pssrApprove-detail",
@@ -56,6 +58,7 @@ export default {
       taskForm: {
         comment: '',
         taskId: '',
+        processId: '',
         condition: '',
         taskName: '',
         processName: '',
@@ -70,51 +73,58 @@ export default {
     }
   },
   methods: {
-    init(id, taskId, processId, taskName,processName) {
+    init(id, taskId, processId, taskName, processName) {
       getSubcontent(id).then(res => {
-        if (taskName=='检查内容负责人'){
-          this.isApprove=2;
+        if (taskName == '检查内容负责人') {
+          this.isApprove = 2;
         }
-        if (taskName=='确认人1'){
-          this.isApprove=4;
+        if (taskName == '确认人1') {
+          this.isApprove = 4;
         }
-        if (taskName=='确认人2'){
-          this.isApprove=5;
+        if (taskName == '确认人2') {
+          this.isApprove = 5;
         }
-        if (taskName=='确认人3'){
-          this.isApprove=6;
+        if (taskName == '确认人3') {
+          this.isApprove = 6;
         }
         console.log(res)
         this.sn = res.data.serialNumber
         this.subId = id;
         this.taskForm.taskId = taskId
+        this.taskForm.processId = processId
         this.taskForm.taskName = taskName
         this.taskForm.processName = processName
-        if (!taskId){
-          this.isApprove=3;
+        if (!taskId) {
+          this.isApprove = 3;
         }
         console.log(this.sn)
         this.visible = true;
+        this.getHistorylist();
       })
-      getHistorylist({processId: processId}).then(response => {
-        this.historyList = response.rows;
-        this.historyLoading = false
-      });
-      listApprove({subId:id}).then(res => {
-        this.taskForm.tPssrApprove=res.rows[0];
+      listApprove({subId: id}).then(res => {
+        this.taskForm.tPssrApprove = res.rows[0];
         console.log(this.taskForm)
       })
       console.log(this.isApprove)
     },
+    getHistorylist() {
+      getHistorylist({processId: this.taskForm.processId}).then(response => {
+        this.historyLoading = false
+        this.historyList = response.rows;
+      });
+    },
+    afterConfirm() {
+      this.visible = false;
+      this.$emit('refreshDataList')
+    },
     dataFormSubmit(val) {
-      this.submitDisabled=true
       this.taskForm.condition = val;
       handlePssrApprove(this.taskForm).then(res => {
         this.msgSuccess("审核成功");
         this.visible = false;
         this.$emit('refreshDataList')
       })
-    }
+    },
   }
 
 }

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

@@ -686,6 +686,7 @@ export default {
       handleConfirmApprove(data).then(res => {
         this.msgSuccess("确认成功");
         this.getList()
+        this.$emit('refreshHisList');
       })
     },
     /** 查询盲板列表 */

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

@@ -475,7 +475,8 @@ export default {
       }
       handleConfirmApproveLock(data).then(res => {
         this.msgSuccess("确认成功");
-        this.getList()
+        this.getList();
+        this.$emit('refreshHisList');
       })
     },
     userFormat(userId) {

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

@@ -97,7 +97,6 @@
           type="danger"
           icon="el-icon-s-promotion"
           size="mini"
-          :disabled="subStatus!=0"
           @click="handleApprove"
           v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulFilter:edit']"

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

@@ -88,7 +88,6 @@
           type="danger"
           icon="el-icon-s-promotion"
           size="mini"
-          :disabled="subStatus!=0"
           v-if="isApprove==0"
           @click="handleApprove"
           v-hasPermi="['pssr:overhaulPipe:edit']"

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

@@ -97,7 +97,6 @@
           type="danger"
           icon="el-icon-s-promotion"
           size="mini"
-          :disabled="subStatus!=0"
           @click="handleApprove"
           v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulPump:edit']"

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

@@ -98,7 +98,6 @@
           type="danger"
           icon="el-icon-s-promotion"
           size="mini"
-          :disabled="subStatus!=0"
           @click="handleApprove"
           v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulTower:edit']"

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

@@ -95,7 +95,6 @@
           type="danger"
           icon="el-icon-s-promotion"
           size="mini"
-          :disabled="subStatus!=0"
           @click="handleApprove"
           v-if="isApprove==0"
           v-hasPermi="['pssr:overhaulValve:edit']"

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

@@ -26,7 +26,7 @@
       <programme :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
     <div v-if="sn=='03'">
-      <blind :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <blind :sub-id="Number(si)" :is-approve="Number(isApprove)"  @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='04'">
       <airtight :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
@@ -84,7 +84,7 @@
       <nitrogen :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
     </div>
     <div v-if="sn=='17'">
-      <lock :sub-id="Number(si)" :is-approve="Number(isApprove)"/>
+      <lock :sub-id="Number(si)" :is-approve="Number(isApprove)" @refreshHisList="refreshHisList"/>
     </div>
     <div v-if="sn=='18'">
       <el-tabs v-model="activeName" @tab-click="handleClick">
@@ -248,6 +248,9 @@ export default {
   },
   methods: {
     handleClick(tab) {
+    },
+    refreshHisList(){
+      this.$emit('refreshHisList')
     }
   }
 }