Commit 1f6f00164ac55116fe256543954960260887f532
1 parent
3265df75
fix: 修复流程预测错误问题
Showing
3 changed files
with
9 additions
and
2 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/BpmProcessInstanceController.java
| ... | ... | @@ -158,11 +158,11 @@ public class BpmProcessInstanceController { |
| 158 | 158 | return success(true); |
| 159 | 159 | } |
| 160 | 160 | |
| 161 | - @PostMapping("/get-approval-detail") | |
| 161 | + @GetMapping("/get-approval-detail") | |
| 162 | 162 | @Operation(summary = "获得审批详情") |
| 163 | 163 | @Parameter(name = "id", description = "流程实例的编号", required = true) |
| 164 | 164 | @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')") |
| 165 | - public CommonResult<BpmApprovalDetailRespVO> getApprovalDetail(@Valid @RequestBody BpmApprovalDetailReqVO reqVO) { | |
| 165 | + public CommonResult<BpmApprovalDetailRespVO> getApprovalDetail(@Valid BpmApprovalDetailReqVO reqVO) { | |
| 166 | 166 | return success(processInstanceService.getApprovalDetail(getLoginUserId(), reqVO)); |
| 167 | 167 | } |
| 168 | 168 | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/instance/BpmApprovalDetailReqVO.java
| ... | ... | @@ -18,6 +18,9 @@ public class BpmApprovalDetailReqVO { |
| 18 | 18 | @Schema(description = "流程变量") |
| 19 | 19 | private Map<String, Object> processVariables; // 使用场景:同 processDefinitionId,用于流程预测 |
| 20 | 20 | |
| 21 | + @Schema(description = "流程变量") | |
| 22 | + private String processVariablesStr; // 使用场景:同 processDefinitionId,用于流程预测 | |
| 23 | + | |
| 21 | 24 | @Schema(description = "流程实例的编号", example = "1024") |
| 22 | 25 | private String processInstanceId; // 使用场景:流程已发起时候传流程实例 ID |
| 23 | 26 | ... | ... |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/task/BpmProcessInstanceServiceImpl.java
| ... | ... | @@ -7,6 +7,7 @@ import cn.hutool.core.lang.Assert; |
| 7 | 7 | import cn.hutool.core.util.ArrayUtil; |
| 8 | 8 | import cn.hutool.core.util.ObjectUtil; |
| 9 | 9 | import cn.hutool.core.util.StrUtil; |
| 10 | +import cn.hutool.json.JSONUtil; | |
| 10 | 11 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 11 | 12 | import cn.iocoder.yudao.framework.common.util.date.DateUtils; |
| 12 | 13 | import cn.iocoder.yudao.framework.common.util.json.JsonUtils; |
| ... | ... | @@ -165,6 +166,9 @@ public class BpmProcessInstanceServiceImpl implements BpmProcessInstanceService |
| 165 | 166 | HistoricProcessInstance historicProcessInstance = null; // 流程实例 |
| 166 | 167 | Integer processInstanceStatus = BpmProcessInstanceStatusEnum.NOT_START.getStatus(); // 流程状态 |
| 167 | 168 | Map<String, Object> processVariables = reqVO.getProcessVariables(); // 流程变量 |
| 169 | + if (reqVO.getProcessVariablesStr() != null){ | |
| 170 | + processVariables = JSONUtil.parseObj(reqVO.getProcessVariablesStr()); | |
| 171 | + } | |
| 168 | 172 | // 1.2 如果是流程已发起的场景,则使用流程实例的数据 |
| 169 | 173 | if (reqVO.getProcessInstanceId() != null) { |
| 170 | 174 | historicProcessInstance = getHistoricProcessInstance(reqVO.getProcessInstanceId()); | ... | ... |