流程节点创建修改

yangys

2025-08-09 264222fc237374a5544b8afe5ab49fbe0184f473

流程节点创建修改

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/FlowMgrController.java

@@ -18,14 +18,18 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.vo.MachineExcelVO;
import org.springblade.mdm.commons.vo.IdsVO;
import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.ApproveTableService;
import org.springblade.mdm.flow.service.FlowBusinessService;
import org.springblade.mdm.flow.vo.FlowVO;
import org.springblade.mdm.flow.vo.OvertimeTaskExcelVO;
import org.springblade.mdm.flow.vo.TaskTraceVO;
import org.springblade.system.feign.IUserClient;
import org.springblade.system.pojo.entity.User;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -54,7 +58,10 @@
    private RuntimeService runtimeService;
    @Autowired
    private ApproveTableService approveTableService;

    @Autowired
    private ApproveRecordService approveRecordService;
    @Autowired
    private IUserClient userClient;
    @GetMapping("overtime-list")
    @ApiOperationSupport(order = 3)
    @Operation(summary = "超时查询", description = "查询所有超时任务")
@@ -83,9 +90,22 @@
    }


    @Operation(summary = "流程执行轨迹", description = "流程执行轨迹")
    @Operation(summary = "流程执行轨迹", description = "流程执行轨迹/审批记录")
    @GetMapping("process-trace")
    public R<List<TaskTraceVO>> processTrace(String processInstanceId){
        /*
        List<ApproveRecord> records = approveRecordService.lambdaQuery().eq(ApproveRecord::getProcessInstanceId,processInstanceId).orderByAsc(ApproveRecord::getCreateTime).list();
        List<TaskTraceVO> result = new ArrayList<>();

        for (ApproveRecord record : records) {
            TaskTraceVO vo = new TaskTraceVO();
            vo.setComment(record.getComment());
            vo.setCreateTime(record.getCreateTime());
            vo.setAssigneeName(record.getUserNickname());

            //vo.setEndTime();
        }*/

        List<TaskTraceVO> result = new ArrayList<>();
        List<HistoricTaskInstance> hisTasks = historyService.createHistoricTaskInstanceQuery()
            .processInstanceId(processInstanceId).orderByTaskCreateTime().desc().list();
@@ -98,6 +118,14 @@
            if(!comments.isEmpty()) {
                vo.setComment(comments.get(0).getFullMessage());
            }

            vo.setTaskName(hisTask.getName());

            R<User> assigneeObj = userClient.userInfoById(Func.toLong(hisTask.getAssignee()));
            if(assigneeObj.isSuccess()) {
                vo.setAssigneeName(assigneeObj.getData().getName());
            }

            result.add(vo);
        }


 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/vo/TaskTraceVO.java

@@ -13,6 +13,8 @@

    @Schema(description = "执行人")
    private String assigneeName;
    @Schema(description = "任务名称")
    private String taskName;
    @Schema(description = "批注")
    private String comment;
    @Schema(description = "开始时间")