From 1b05bdf817bbcb06c8d43afed01a0ec979d49910 Mon Sep 17 00:00:00 2001 From: gssong <1742057357@qq.com> Date: Sat, 16 Nov 2024 19:26:12 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E8=B0=83=E6=95=B4=E8=BD=AC=E5=8A=9E?= =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E7=AD=BE=E7=AD=89=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/FlwTaskController.java | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java index e4a06d0a7..ba6652866 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java @@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; +import org.dromara.common.core.enums.BusinessStatusEnum; +import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; @@ -13,14 +15,13 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; import org.dromara.warm.flow.core.dto.FlowParams; -import org.dromara.warm.flow.core.dto.ModifyHandler; import org.dromara.warm.flow.core.entity.HisTask; import org.dromara.warm.flow.core.entity.Instance; import org.dromara.warm.flow.core.entity.Task; import org.dromara.warm.flow.core.enums.CooperateType; -import org.dromara.warm.flow.core.enums.FlowStatus; import org.dromara.warm.flow.core.service.InsService; import org.dromara.warm.flow.core.service.TaskService; +import org.dromara.workflow.common.enums.TaskStatusEnum; import org.dromara.workflow.domain.bo.*; import org.dromara.workflow.domain.vo.FlowHisTaskVo; import org.dromara.workflow.domain.vo.FlowTaskVo; @@ -33,6 +34,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import static org.dromara.workflow.common.enums.TaskAssigneeEnum.USER; + /** * 任务管理 控制层 * @@ -142,7 +145,7 @@ public class FlwTaskController extends BaseController { FlowTaskVo flowTaskVo = BeanUtil.toBean(task, FlowTaskVo.class); Instance instance = insService.getById(task.getInstanceId()); flowTaskVo.setFlowStatus(instance.getFlowStatus()); - flowTaskVo.setFlowStatusName(FlowStatus.getValueByKey(instance.getFlowStatus())); + flowTaskVo.setFlowStatusName(BusinessStatusEnum.findByStatus(instance.getFlowStatus())); return R.ok(flowTaskVo); } return R.fail(); @@ -170,10 +173,11 @@ public class FlwTaskController extends BaseController { @PostMapping("/delegateTask") public R delegateTask(@Validated({AddGroup.class}) @RequestBody DelegateBo bo) { FlowParams flowParams = new FlowParams(); - flowParams.addHandlers(Collections.singletonList(bo.getUserId())); + flowParams.addHandlers(Collections.singletonList(USER.getCode()+bo.getUserId())); flowParams.handler(LoginHelper.getUserIdStr()); flowParams.permissionFlag(WorkflowUtils.permissionList()); flowParams.message(bo.getMessage()); + flowParams.hisStatus(TaskStatusEnum.DEPUTE.getStatus()); return toAjax(taskService.depute(bo.getTaskId(), flowParams)); } @@ -187,10 +191,11 @@ public class FlwTaskController extends BaseController { @PostMapping("/transferTask") public R transferTask(@Validated({AddGroup.class}) @RequestBody TransferBo bo) { FlowParams flowParams = new FlowParams(); - flowParams.addHandlers(Collections.singletonList(bo.getUserId())); + flowParams.addHandlers(Collections.singletonList(USER.getCode()+bo.getUserId())); flowParams.handler(LoginHelper.getUserIdStr()); flowParams.permissionFlag(WorkflowUtils.permissionList()); flowParams.message(bo.getMessage()); + flowParams.hisStatus(TaskStatusEnum.TRANSFER.getStatus()); return toAjax(taskService.transfer(bo.getTaskId(), flowParams)); } @@ -204,10 +209,11 @@ public class FlwTaskController extends BaseController { @PostMapping("/addSignature") public R addSignature(@Validated({AddGroup.class}) @RequestBody AddSignatureBo bo) { FlowParams flowParams = new FlowParams(); - flowParams.addHandlers(bo.getUserIds()); + flowParams.addHandlers(StreamUtils.toList(bo.getUserIds(),u->USER.getCode()+u)); flowParams.handler(LoginHelper.getUserIdStr()); flowParams.permissionFlag(WorkflowUtils.permissionList()); flowParams.message(bo.getMessage()); + flowParams.hisStatus(TaskStatusEnum.SIGN.getStatus()); return toAjax(taskService.addSignature(bo.getTaskId(), flowParams)); } @@ -221,10 +227,11 @@ public class FlwTaskController extends BaseController { @PostMapping("/reductionSignature") public R reductionSignature(@Validated({AddGroup.class}) @RequestBody ReductionSignatureBo bo) { FlowParams flowParams = new FlowParams(); - flowParams.reductionHandlers(bo.getUserIds()); + flowParams.reductionHandlers(StreamUtils.toList(bo.getUserIds(),u->USER.getCode()+u)); flowParams.handler(LoginHelper.getUserIdStr()); flowParams.permissionFlag(WorkflowUtils.permissionList()); flowParams.message(bo.getMessage()); + flowParams.hisStatus(TaskStatusEnum.SIGN_OFF.getStatus()); return toAjax(taskService.reductionSignature(bo.getTaskId(), flowParams)); } @@ -239,7 +246,7 @@ public class FlwTaskController extends BaseController { @PutMapping("/updateAssignee/{taskId}/{userId}") public R updateAssignee(@PathVariable Long taskId, @PathVariable String userId) { FlowParams flowParams = new FlowParams(); - flowParams.addHandlers(Collections.singletonList(userId)); + flowParams.addHandlers(Collections.singletonList(USER.getCode()+userId)); flowParams.cooperateType(CooperateType.APPROVAL.getKey()); flowParams.ignore(false); flowParams.message("修改任务办理人");