From cdb8d7552de8f17f4366df8b0cc3d9565c6c6292 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 11 Oct 2023 16:07:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=A1=E6=89=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/ActFlowCommonService.java | 5 ++-- .../ProcessESInitChangeController.java | 26 ++++++++++++++----- .../service/ProcessEsInitChangeService.java | 2 +- .../impl/ProcessEsInitChangeServiceImpl.java | 26 +++++++++++-------- 4 files changed, 38 insertions(+), 21 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java index 75bbd1c1..188359e9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java @@ -4,7 +4,6 @@ import com.jero.common.exception.JeroBootException; import com.jero.common.system.api.ISysBaseAPI; import com.jero.common.system.vo.LoginUser; import com.jero.modules.activiti.process.common.entity.CenterQueryVO; -import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService; import com.jero.modules.activiti.util.SpringContextUtil; import com.jero.modules.sys.utils.UserUtils; import lombok.extern.slf4j.Slf4j; @@ -69,7 +68,7 @@ public class ActFlowCommonService { /** * 完成提交任务 */ - public void completeTask(String remark, String taskId, String userId) { + public void completeTask(String remark, String taskId, String userId, Map map) { //任务Id 查询任务对象 Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); @@ -91,7 +90,7 @@ public class ActFlowCommonService { log.info("负责人id=" + userId); log.info("流程实例id=" + processInstanceId); //完成办理 - taskService.complete(taskId); + taskService.complete(taskId, map); log.info("-----------完成任务操作 结束----------"); } 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 4cdd191a..1e18185c 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 @@ -90,16 +90,30 @@ public class ProcessESInitChangeController { /** - * 审批（同意/驳回） + * 同意 * * @param taskId * @param esInitChangeList */ - @AutoLog(value = "企标立项变更流程-审批（同意/驳回）") - @ApiOperation(value="企标立项变更流程-审批（同意/驳回）", notes="企标立项变更流程-审批（同意/驳回）") - @PostMapping("/approval") - public Result approval(@RequestParam("taskId") String taskId, @RequestBody List esInitChangeList) { - initChangeService.approvalInitChange(taskId, esInitChangeList); + @AutoLog(value = "企标立项变更流程-同意") + @ApiOperation(value="企标立项变更流程-同意", notes="企标立项变更流程-同意") + @PostMapping("/agree") + public Result agree(@RequestParam("taskId") String taskId, @RequestBody List esInitChangeList) { + initChangeService.approvalInitChange(taskId, esInitChangeList, true); + return Result.OK(); + } + + /** + * 驳回 + * + * @param taskId + * @param esInitChangeList + */ + @AutoLog(value = "企标立项变更流程-驳回") + @ApiOperation(value="企标立项变更流程-驳回", notes="企标立项变更流程-驳回") + @PostMapping("/reject") + public Result reject(@RequestParam("taskId") String taskId, @RequestBody List esInitChangeList) { + initChangeService.approvalInitChange(taskId, esInitChangeList, false); return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java index 07585bd3..1a48282a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/ProcessEsInitChangeService.java @@ -31,7 +31,7 @@ public interface ProcessEsInitChangeService extends IService esInitChange); + void approvalInitChange(String taskId, List esInitChange, boolean pass); /** * 保存到待办 diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java index 4626eb05..e85a74ae 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java @@ -5,7 +5,6 @@ import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.common.service.IActFlowCustomService; import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange; -import com.jero.modules.activiti.process.esInitChange.entity.enums.ESProjectType; import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService; import com.jero.modules.activiti.process.esInitChange.mapper.ProcessEsInitChangeMapper; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; @@ -103,7 +102,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl esInitChangeList) { - // 校验企标编号是否冲突 - if (!esUtil.verifyEnStandardNumber(esInitChangeList.get(0).getOriginEnStandardNo())) { - throw new JeroBootException("企标编号冲突"); - } + public void approvalInitChange(String taskId, List esInitChangeList, boolean pass) { String userId = UserUtils.getUserId(); - // 更新业务流程数据 - saveOrUpdateBatch(esInitChangeList); + Map map = new HashMap<>(); + if (pass) { + // 校验企标编号是否冲突 + if (!esUtil.verifyEnStandardNumber(esInitChangeList.get(0).getOriginEnStandardNo())) { + throw new JeroBootException("企标编号冲突"); + } + // 更新业务流程数据 + saveOrUpdateBatch(esInitChangeList); + map = setVariables(esInitChangeList.get(0)); + } // 设置流程变量 - setVariables(esInitChangeList.get(0)); + map.put("pass", pass); // TODO 保存流程审批信息 - actFlowCommonService.completeTask(esInitChangeList.get(0).getRemarks(), taskId, userId); + actFlowCommonService.completeTask(esInitChangeList.get(0).getRemarks(), taskId, userId, map); } @Override public void saveToWait(String taskId, ProcessEsInitChange esInitChange) { // TODO 检查任务是否存在 + // 检查任务是否存在 saveOrUpdate(esInitChange); }