diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java index c583d12b..5ea185af 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/BpmProcessDefinitionController.java @@ -44,7 +44,7 @@ public class BpmProcessDefinitionController { BpmProcessDefinitionListReqVO listReqVO) { List respVOS = bpmDefinitionService.getProcessDefinitionList(listReqVO); - respVOS = respVOS.stream().filter(data -> !data.getId().contains("work_task")).collect(Collectors.toList()); + respVOS = respVOS.stream().filter(data -> !(data.getId().contains("work_task") || data.getId().contains("work_order"))).collect(Collectors.toList()); return success(respVOS); } diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/workorder/BpmOAWorkOrderUpdateReqVO.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/workorder/BpmOAWorkOrderUpdateReqVO.java index ccad5d6a..5922141f 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/workorder/BpmOAWorkOrderUpdateReqVO.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/workorder/BpmOAWorkOrderUpdateReqVO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.workorder; +import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -20,6 +21,9 @@ public class BpmOAWorkOrderUpdateReqVO { @Schema(description = "工单状态", example = "3") private Integer status; + @Schema(description = "BPM流程结果", example = "3") + private Integer result; + @Schema(description = "期望完成时间", example = "2024-12-20 18:00:00") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime expectedTime; @@ -31,4 +35,4 @@ public class BpmOAWorkOrderUpdateReqVO { @Schema(description = "工单处理结果说明", example = "已成功修复系统登录问题,用户可以正常登录") private String resultDescription; -} \ No newline at end of file +} diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAWorkOrderServiceImpl.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAWorkOrderServiceImpl.java index 949e807b..86f55f79 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAWorkOrderServiceImpl.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOAWorkOrderServiceImpl.java @@ -164,6 +164,7 @@ public class BpmOAWorkOrderServiceImpl extends BpmOABaseService implements BpmOA BpmOAWorkOrderDO updateData = BpmOAWorkOrderDO.builder() .id(updateReqVO.getId()) .status(updateReqVO.getStatus()) + .result(updateReqVO.getResult()) .expectedTime(updateReqVO.getExpectedTime()) .completedTime(updateReqVO.getCompletedTime()) .resultDescription(updateReqVO.getResultDescription())