feat: 流程转办调用统一逻辑

laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java

@@ -7,6 +7,7 @@ import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO;
 import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService;
+import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -30,8 +31,7 @@ public class ESAbolishController {
     private ProcessEsAbolishService abolishService;
 
     @Resource
-    private ActFlowCommonService actFlowCommonService;
+    private IProcessHandleService processHandleService;
-
     /**
      * 新增立项变更申请
      *
@@ -118,7 +118,7 @@ public class ESAbolishController {
     @ApiOperation(value="企标废止发起流程-转办", notes="企标废止发起流程-转办")
     @PostMapping(value = "/transfer")
     public Result<?> transfer(@RequestBody TransferVO transferVO) {
-        actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+        processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId());
         return Result.OK();
     }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java

@@ -9,6 +9,7 @@ import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esAnnualInit.entity.vo.AnnualInitDataVO;
 import com.jero.modules.activiti.process.esAnnualInit.service.ProcessEsAnnualInitService;
+import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.IOUtils;
@@ -38,7 +39,7 @@ public class ESAnnualInitController {
     private ProcessEsAnnualInitService annualInitService;
 
     @Resource
-    private ActFlowCommonService actFlowCommonService;
+    private IProcessHandleService processHandleService;
 
     /**
      * 新增立项变更申请
@@ -155,7 +156,7 @@ public class ESAnnualInitController {
     @ApiOperation(value="企标年度制修订标准化发起流程-转办", notes="企标年度制修订标准化发起流程-转办")
     @PostMapping(value = "/transfer")
     public Result<?> transfer(@RequestBody TransferVO transferVO) {
-        actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+        processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId());
         return Result.OK();
     }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java

@@ -8,6 +8,7 @@ import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esAnnualReport.entity.vo.AnnualReportDataVO;
 import com.jero.modules.activiti.process.esAnnualReport.service.ProcessEsAnnualReportService;
+import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -40,7 +41,7 @@ public class ESAnnualReportController {
     private ProcessEsAnnualReportService annualReportService;
 
     @Resource
-    private ActFlowCommonService actFlowCommonService;
+    private IProcessHandleService processHandleService;
 
     /**
      * 导入模板下载
@@ -154,7 +155,7 @@ public class ESAnnualReportController {
     @ApiOperation(value="企标年度制修订主动上报流程-转办", notes="企标年度制修订主动上报流程-转办")
     @PostMapping(value = "/transfer")
     public Result<?> transfer(@RequestBody TransferVO transferVO) {
-        actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+        processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId());
         return Result.OK();
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java

@@ -7,6 +7,7 @@ import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
 import com.jero.modules.activiti.process.esArchive.service.ProcessEsArchiveService;
+import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -30,7 +31,7 @@ public class ESArchiveController {
     private ProcessEsArchiveService archiveService;
 
     @Resource
-    private ActFlowCommonService actFlowCommonService;
+    private IProcessHandleService processHandleService;
 
     /**
      * 新增企标封存申请
@@ -117,7 +118,7 @@ public class ESArchiveController {
     @ApiOperation(value="企标封存流程-转办", notes="企标封存流程-转办")
     @PostMapping(value = "/transfer")
     public Result<?> transfer(@RequestBody TransferVO transferVO) {
-        actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+        processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId());
         return Result.OK();
     }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java

@@ -7,6 +7,7 @@ import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esChange.entity.vo.ESChangeDataVO;
 import com.jero.modules.activiti.process.esChange.service.ProcessEsChangeService;
+import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -30,8 +31,7 @@ public class ESChangeController {
     private ProcessEsChangeService changeService;
 
     @Resource
-    private ActFlowCommonService actFlowCommonService;
+    private IProcessHandleService processHandleService;
-
     /**
      * 新增企标更改流程
      *
@@ -103,7 +103,7 @@ public class ESChangeController {
     @ApiOperation(value="企标更改流程-转办", notes="企标更改流程-转办")
     @PostMapping(value = "/transfer")
     public Result<?> transfer(@RequestBody TransferVO transferVO) {
-        actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+        processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId());
         return Result.OK();
     }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java

@@ -64,7 +64,7 @@ public class ProcessEsChange implements Serializable {
      * 0表示未删除,1表示删除
      */
     @ApiModelProperty(value = "0表示未删除,1表示删除")
-    private String delFlag;
+    private Integer delFlag;
 
     /**
      * 流程实例Id

laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java

@@ -7,6 +7,7 @@ import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esEnable.entity.vo.ESEnableDataVO;
 import com.jero.modules.activiti.process.esEnable.service.ProcessEsEnableService;
+import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -30,7 +31,7 @@ public class ESEnableController {
     private ProcessEsEnableService enableService;
 
     @Resource
-    private ActFlowCommonService actFlowCommonService;
+    private IProcessHandleService processHandleService;
 
     /**
      * 新增立项变更申请
@@ -117,8 +118,8 @@ public class ESEnableController {
     @ApiOperation(value="企标启用发起流程-转办", notes="企标启用发起流程-转办")
     @PostMapping(value = "/transfer")
     public Result<?> transfer(@RequestBody TransferVO transferVO) {
-        actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+        processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId());
-        return Result.OK();
+        Result.OK();
     }
 
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java

@@ -8,6 +8,7 @@ import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
 import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO;
 import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService;
+import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.laws.common.constant.FieldCommon;
 import com.jero.modules.laws.enterprise.entity.dto.ESPlanQueryDTO;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
@@ -41,7 +42,7 @@ public class ProcessESInitChangeController {
     private EnterpriseStandardPlanService espService;
 
     @Resource
-    private ActFlowCommonService actFlowCommonService;
+    private IProcessHandleService processHandleService;
 
     /**
      * 新增立项变更申请
@@ -170,7 +171,7 @@ public class ProcessESInitChangeController {
     @ApiOperation(value="企标立项变更流程-转办", notes="企标立项变更流程-转办")
     @PostMapping(value = "/transfer")
     public Result<?> transfer(@RequestBody TransferVO transferVO) {
-        actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+        processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId());
         return Result.OK();
     }
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java

@@ -7,6 +7,7 @@ import com.jero.modules.activiti.process.common.entity.TransferVO;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
 import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService;
+import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -30,7 +31,7 @@ public class ESRecheckController {
     private ProcessEsRecheckService recheckService;
 
     @Resource
-    private ActFlowCommonService actFlowCommonService;
+    private IProcessHandleService processHandleService;
 
     /**
      * 企标复审申请
@@ -129,7 +130,7 @@ public class ESRecheckController {
     @ApiOperation(value="企标复审流程-转办", notes="企标复审流程-转办")
     @PostMapping(value = "/transfer")
     public Result<?> transfer(@RequestBody TransferVO transferVO) {
-        actFlowCommonService.transfer(transferVO.getTaskId(), transferVO.getUserId());
+        processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId());
         return Result.OK();
     }