From e8c3af4ea446255bf3d6f8abb49ab3fe04831396 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 26 Oct 2023 10:46:45 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E7=AB=8B=E9=A1=B9?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E5=8A=9E=E7=90=86=E6=8E=A5=E5=8F=A3=20?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProcessCenterController.java | 93 ------------------- .../process/common/entity/CommonVO.java | 17 ++++ .../ProcessESInitChangeController.java | 26 ++++-- .../service/ProcessEsInitChangeService.java | 13 ++- .../impl/ProcessEsInitChangeServiceImpl.java | 86 +++++++++++------ 5 files changed, 102 insertions(+), 133 deletions(-) delete mode 100644 laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ProcessCenterController.java diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ProcessCenterController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ProcessCenterController.java deleted file mode 100644 index afabd12c..00000000 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/controller/ProcessCenterController.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.jero.modules.activiti.process.common.controller; - -import com.jero.common.api.vo.Result; -import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.aspect.annotation.Translation; -import com.jero.modules.activiti.process.common.entity.CenterQueryVO; -import com.jero.modules.activiti.process.common.service.ActFlowCommonService; -import com.jero.modules.activiti.process.common.service.ProcessDraftService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; - -/** - * @author: Mzaxd - * @Date: 2023/10/11 9:33 - */ - -@Slf4j -@RestController -@Api(tags = "流程中心") -@RequestMapping("/process/center") -public class ProcessCenterController { - - @Resource - private ProcessDraftService draftService; - - @Resource - private ActFlowCommonService actFlowCommonService; - - /** - * 待办流程 - * @param centerQueryVO - */ - @AutoLog(value = "流程中心-待办流程") - @ApiOperation(value="流程中心-待办流程", notes="流程中心-待办流程") - @GetMapping("/todoTaskList") - public Result todoTaskList(@Valid CenterQueryVO centerQueryVO, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) { - return Result.OK(actFlowCommonService.todoTaskList(centerQueryVO, pageNo, pageSize)); - } - - /** - * 已办流程 - * @param centerQueryVO - */ - @AutoLog(value = "流程中心-已办流程") - @ApiOperation(value="流程中心-已办流程", notes="流程中心-已办流程") - @GetMapping("/doneTaskList") - public Result doneTaskList(@Valid CenterQueryVO centerQueryVO) { - // TODO - return Result.OK(); - } - - /** - * 已发流程 - * @param centerQueryVO - */ - @AutoLog(value = "流程中心-已发流程") - @ApiOperation(value="流程中心-已发流程", notes="流程中心-已发流程") - @GetMapping("/sendTaskList") - public Result sendTaskList(@Valid CenterQueryVO centerQueryVO) { - // TODO - return Result.OK(); - } - - /** - * 监控流程 - * @param centerQueryVO - */ - @AutoLog(value = "流程中心-监控流程") - @ApiOperation(value="流程中心-监控流程", notes="流程中心-监控流程") - @GetMapping("/monitorTaskList") - public Result monitorTaskList(@Valid CenterQueryVO centerQueryVO) { - // TODO - return Result.OK(); - } - - /** - * 草稿 - * @param centerQueryVO - */ - @AutoLog(value = "流程中心-草稿") - @ApiOperation(value="流程中心-草稿", notes="流程中心-草稿") - @GetMapping("/draftList") - public Result draftList(@Valid CenterQueryVO centerQueryVO) { - return Result.OK(draftService.getDraftList(centerQueryVO)); - } -} diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CommonVO.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CommonVO.java index 355c59d5..481f863e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CommonVO.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CommonVO.java @@ -1,5 +1,6 @@ package com.jero.modules.activiti.process.common.entity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -11,35 +12,51 @@ import java.util.Date; @Data public class CommonVO { + /** + * 任务ID + */ + @ApiModelProperty("任务ID") String taskId; /** * 备注 */ + @ApiModelProperty("备注") String commitText; /** * 附件 */ + @ApiModelProperty("附件") String commitFile; /** * 同意驳回标识 */ + @ApiModelProperty("同意驳回标识") Integer commitFlag; + /** + * 同意驳回标识 + */ + @ApiModelProperty("同意驳回标识") + boolean pass; + /** * 流程名称 */ + @ApiModelProperty("流程名称") String prcName; /** * 截止日期 */ + @ApiModelProperty("截止日期") Date dueTime; /** * 流程描述 */ + @ApiModelProperty("流程描述") String prcMes; } 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 49521046..3e0127eb 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 @@ -83,34 +83,40 @@ public class ProcessESInitChangeController { return Result.OK(); } + /** + * 保存到待办 + * @param taskId + */ + @AutoLog(value = "企标立项变更流程-办理") + @ApiOperation(value="企标立项变更流程-办理", notes="企标立项变更流程-办理") + @PostMapping("/save") + public Result handle(@RequestParam(value = "taskId") String taskId) { + return Result.OK(initChangeService.getHandleData(taskId)); + } /** * 同意 * - * @param taskId - * @param esInitChangeList + * @param initChangeData */ @AutoLog(value = "企标立项变更流程-同意") @ApiOperation(value="企标立项变更流程-同意", notes="企标立项变更流程-同意") @PostMapping("/agree") - public Result agree(@RequestParam("taskId") String taskId, @RequestBody List esInitChangeList) { - // TODO 重写 - initChangeService.approvalInitChange(taskId, esInitChangeList, true); + public Result agree(@RequestBody InitChangeDataVO initChangeData) { + initChangeService.approvalInitChange(initChangeData, true); return Result.OK(); } /** * 驳回 * - * @param taskId - * @param esInitChangeList + * @param initChangeData */ @AutoLog(value = "企标立项变更流程-驳回") @ApiOperation(value="企标立项变更流程-驳回", notes="企标立项变更流程-驳回") @PostMapping("/reject") - public Result reject(@RequestParam("taskId") String taskId, @RequestBody List esInitChangeList) { - // TODO 重写 - initChangeService.approvalInitChange(taskId, esInitChangeList, false); + public Result reject(@RequestBody InitChangeDataVO initChangeData) { + initChangeService.approvalInitChange(initChangeData, 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 bf2b33d4..935706fe 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 @@ -29,10 +29,10 @@ public interface ProcessEsInitChangeService extends IService esInitChange, boolean pass); + void approvalInitChange(InitChangeDataVO initChangeData, boolean pass); /** * 保存到草稿 @@ -47,4 +47,11 @@ public interface ProcessEsInitChangeService extends IService lambdaQueryWrapper = new LambdaQueryWrapper<>(); -// lambdaQueryWrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId); -// lambdaQueryWrapper.eq(ProcessEsInitChange::getDelFlag, YesOrNoEnum.NO.getValue()); -// return list(lambdaQueryWrapper); - return null; + @Override + public InitChangeDataVO getHandleData(String taskId) { + InitChangeDataVO initChangeDataVO = new InitChangeDataVO(); + // 使用流程引擎根据taskId找到流程实例Id + Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); + String processInstanceId = task.getProcessInstanceId(); + // 获取流程通用数据 + ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId); + CommonVO commonVO = new CommonVO(); + commonVO.setPrcName(process.getPrcName()); + commonVO.setPrcMes(process.getPrcMes()); + commonVO.setDueTime(process.getDueTime()); + initChangeDataVO.setCommonVO(commonVO); + // 获取流程实例数据 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId); + lambdaQueryWrapper.eq(ProcessEsInitChange::getDelFlag, YesOrNoEnum.NO.getValue()); + List dataList = list(lambdaQueryWrapper); + initChangeDataVO.setDataList(dataList); + // TODO 选人组件内容填充 + return initChangeDataVO; } @Override @@ -146,23 +169,32 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl esInitChangeList, boolean pass) { -// String userId = UserUtils.getUserId(); -// Map map = new HashMap<>(); -// if (pass) { -// // 校验企标编号是否冲突 -// if (!esUtil.verifyEnStandardNumber(esInitChangeList.get(0).getOriginEnStandardNo())) { -// throw new JeroBootException("企标编号冲突"); -// } -// // 更新业务流程数据 -// saveOrUpdateBatch(esInitChangeList); -// map = setVariables(esInitChangeList.get(0)); -// } -// // 设置流程变量 -// map.put("pass", pass); -// actFlowCommonService.completeTask(esInitChangeList.get(0).getRemarks(), taskId, userId, map); -// // TODO 保存流程审批信息 - + public void approvalInitChange(InitChangeDataVO initChangeDataVO, boolean pass) { + CommonVO commonVO = initChangeDataVO.getCommonVO(); + String taskId = commonVO.getTaskId(); + List esInitChangeList = initChangeDataVO.getDataList(); + Map map = new HashMap<>(); + if (pass) { + // 校验企标编号是否冲突 + if (!esUtil.verifyEnStandardNumber(esInitChangeList.get(0).getOriginEnStandardNo())) { + throw new JeroBootException("企标编号冲突"); + } + // 更新业务流程数据 + saveOrUpdateBatch(esInitChangeList); + map = setVariables(initChangeDataVO); + } + // 设置流程变量 + map.put("pass", pass); + //更新审批表为完成，填充数据 + ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(taskId); + approvalRecord.setCommitFlag(pass? CommitFlagEnum.PASS.getValue() : CommitFlagEnum.REJECT.getValue()); + approvalRecord.setCommitText(commonVO.getCommitText()); + approvalRecord.setCommitFile(commonVO.getCommitFile()); + approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue()); + approvalRecord.setEndTime(new Date()); + processApprovalRecordService.updateById(approvalRecord); + //审批节点 + taskService.complete(taskId, map); } @Override