Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.工作流异常

Browse Source
This commit is contained in:
cdf
2024-04-03 16:39:28 +08:00
parent 999cf1bc6f
commit 30f6778296
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-process/process-api/src/main/java/com/njcn/process/pojo/dto/flowable/FlowTaskDto.java
View File

@@ -100,4 +100,6 @@ public class FlowTaskDto implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date finishTime; private Date finishTime;
@ApiModelProperty("此流程对应的发起表单功能")
private String formAssId;
} }

8
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/flowable/FlowTaskServiceImpl.java
View File

@@ -4,15 +4,18 @@ package com.njcn.process.service.impl.flowable;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.pojo.response.HttpResult;
import com.njcn.process.enums.FlowComment; import com.njcn.process.enums.FlowComment;
import com.njcn.process.factory.FlowServiceFactory; 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.FlowViewerDto;
import com.njcn.process.pojo.dto.flowable.FlowCommentDto; import com.njcn.process.pojo.dto.flowable.FlowCommentDto;
import com.njcn.process.pojo.dto.flowable.FlowTaskDto; 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.FlowQueryVo;
import com.njcn.process.pojo.vo.flowable.FlowTaskVo; import com.njcn.process.pojo.vo.flowable.FlowTaskVo;
import com.njcn.process.service.flowable.IFlowTaskService; import com.njcn.process.service.flowable.IFlowTaskService;
@@ -72,6 +75,8 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
private final UserFeignClient userFeignClient; private final UserFeignClient userFeignClient;
private final FlowableAssMapper flowableAssMapper;
@Override @Override
public Boolean getNextFlowNodeByStart(FlowTaskVo flowTaskVo) { public Boolean getNextFlowNodeByStart(FlowTaskVo flowTaskVo) {
@@ -331,7 +336,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
List<Task> taskList = taskQuery.listPage(queryVo.getPageSize() * (queryVo.getPageNum() - 1), queryVo.getPageSize()); List<Task> taskList = taskQuery.listPage(queryVo.getPageSize() * (queryVo.getPageNum() - 1), queryVo.getPageSize());
List<FlowTaskDto> flowList = new ArrayList<>(); List<FlowTaskDto> flowList = new ArrayList<>();
for (Task task : taskList) { for (Task task : taskList) {
FlowableAss flowableAss = flowableAssMapper.selectOne(new LambdaQueryWrapper<FlowableAss>().eq(FlowableAss::getExecIndex,task.getProcessInstanceId()));
FlowTaskDto flowTask = new FlowTaskDto(); FlowTaskDto flowTask = new FlowTaskDto();
flowTask.setFormAssId(flowableAss.getThsIndex());
// 当前流程信息 // 当前流程信息
flowTask.setTaskId(task.getId()); flowTask.setTaskId(task.getId());
flowTask.setTaskDefKey(task.getTaskDefinitionKey()); flowTask.setTaskDefKey(task.getTaskDefinitionKey());