From 8115d28cea8fe6ab05ac82136808f839cf827474 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 4 Dec 2023 15:08:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B5=81=E7=A8=8B=E8=BD=AC=E5=8A=9E?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E7=BB=9F=E4=B8=80=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/esAbolish/controller/ESAbolishController.java | 6 +++--- .../esAnnualInit/controller/ESAnnualInitController.java | 5 +++-- .../controller/ESAnnualReportController.java | 5 +++-- .../process/esArchive/controller/ESArchiveController.java | 5 +++-- .../process/esChange/controller/ESChangeController.java | 6 +++--- .../activiti/process/esChange/entity/ProcessEsChange.java | 2 +- .../process/esEnable/controller/ESEnableController.java | 7 ++++--- .../controller/ProcessESInitChangeController.java | 5 +++-- .../process/esRecheck/controller/ESRecheckController.java | 5 +++-- 9 files changed, 26 insertions(+), 20 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java index 2b77028d..fce33e8f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/controller/ESAbolishController.java +++ b/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(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java index 6135dbb3..540ee61d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/controller/ESAnnualInitController.java +++ b/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(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java index 11d90c8d..e6ddaaab 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java +++ b/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(); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java index 0a159f9a..20cefe7f 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/controller/ESArchiveController.java +++ b/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(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java index 46c7d868..cbe4d3e7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/controller/ESChangeController.java +++ b/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(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java index 4ee5e21a..abe761d6 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java +++ b/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 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java index 7fa2aac5..8ebd810c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/controller/ESEnableController.java +++ b/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()); - return Result.OK(); + processHandleService.transfer(transferVO.getTaskId(), transferVO.getUserId()); + Result.OK(); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java index bc38fb46..1c531224 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java +++ b/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(); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java index b70d5120..cfe4ceb0 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/controller/ESRecheckController.java +++ b/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(); }