diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/flowable/FlowTaskDto.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/flowable/FlowTaskDto.java index 3bc6e7437..df8ec99f1 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/flowable/FlowTaskDto.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/flowable/FlowTaskDto.java @@ -100,4 +100,6 @@ public class FlowTaskDto implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date finishTime; + @ApiModelProperty("此流程对应的发起表单功能") + private String formAssId; } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/flowable/FlowTaskServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/flowable/FlowTaskServiceImpl.java index a4fb4b2f4..0e6e45523 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/flowable/FlowTaskServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/flowable/FlowTaskServiceImpl.java @@ -4,15 +4,18 @@ package com.njcn.process.service.impl.flowable; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.process.enums.FlowComment; import com.njcn.process.factory.FlowServiceFactory; +import com.njcn.process.mapper.FlowableAssMapper; import com.njcn.process.pojo.dto.FlowViewerDto; import com.njcn.process.pojo.dto.flowable.FlowCommentDto; import com.njcn.process.pojo.dto.flowable.FlowTaskDto; +import com.njcn.process.pojo.po.FlowableAss; import com.njcn.process.pojo.vo.flowable.FlowQueryVo; import com.njcn.process.pojo.vo.flowable.FlowTaskVo; import com.njcn.process.service.flowable.IFlowTaskService; @@ -72,6 +75,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask private final UserFeignClient userFeignClient; + private final FlowableAssMapper flowableAssMapper; + @Override public Boolean getNextFlowNodeByStart(FlowTaskVo flowTaskVo) { @@ -331,7 +336,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask List taskList = taskQuery.listPage(queryVo.getPageSize() * (queryVo.getPageNum() - 1), queryVo.getPageSize()); List flowList = new ArrayList<>(); for (Task task : taskList) { + FlowableAss flowableAss = flowableAssMapper.selectOne(new LambdaQueryWrapper().eq(FlowableAss::getExecIndex,task.getProcessInstanceId())); + FlowTaskDto flowTask = new FlowTaskDto(); + flowTask.setFormAssId(flowableAss.getThsIndex()); // 当前流程信息 flowTask.setTaskId(task.getId()); flowTask.setTaskDefKey(task.getTaskDefinitionKey());