Merge branch 'feature/REQ-7125' into dev

This commit is contained in:
wangli 2026-03-03 16:27:27 +08:00
commit 4aa4c51f11

View File

@ -4,6 +4,7 @@ import cn.axzo.workflow.client.feign.bpmn.ProcessTaskApi;
import cn.axzo.workflow.common.annotation.InvokeMode;
import cn.axzo.workflow.common.annotation.Manageable;
import cn.axzo.workflow.common.enums.AttachmentTypeEnum;
import cn.axzo.workflow.common.enums.BpmnProcessInstanceResultEnum;
import cn.axzo.workflow.common.exception.WorkflowEngineException;
import cn.axzo.workflow.common.model.request.bpmn.task.AttachmentDTO;
import cn.axzo.workflow.common.model.request.bpmn.task.BpmnNodeBackSystemOperateDTO;
@ -343,6 +344,7 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp
@PostMapping("/upgrade")
@RepeatSubmit
public CommonResponse<Boolean> upgradeTask(@Validated @RequestBody BpmnTaskResetApproversDTO dto) {
dto.setStatusEnum(BpmnProcessInstanceResultEnum.UPGRADED);
if (!StringUtils.hasText(dto.getProcessInstanceId()) && !StringUtils.hasText(dto.getTaskId())) {
throw new WorkflowEngineException(TASK_OPERATION_PARAM_INVALID);
}
@ -366,6 +368,7 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp
@InvokeMode(ASYNC)
@Override
public CommonResponse<Boolean> repointTask(BpmnTaskResetApproversDTO dto) {
dto.setStatusEnum(BpmnProcessInstanceResultEnum.REPOINT);
if (!StringUtils.hasText(dto.getProcessInstanceId()) && !StringUtils.hasText(dto.getTaskId())) {
throw new WorkflowEngineException(TASK_OPERATION_PARAM_INVALID);
}