根据冀北专责需求调整我的待办内容
1、取消展示终端监测计划; 2、增加技术监督测试计划展示;
This commit is contained in:
@@ -14,6 +14,7 @@ import java.util.Arrays;
|
||||
@AllArgsConstructor
|
||||
public enum BpmProcessInstanceStatusEnum implements IntArrayValuable {
|
||||
|
||||
AWAIT(0, "待提交审批"),
|
||||
RUNNING(1, "审批中"),
|
||||
APPROVE(2, "审批通过"),
|
||||
REJECT(3, "审批不通过"),
|
||||
|
||||
@@ -49,10 +49,7 @@ import org.springframework.web.bind.annotation.*;
|
||||
import org.flowable.task.api.history.HistoricTaskInstance;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
@@ -151,23 +148,21 @@ public class BpmTaskController extends BaseController {
|
||||
public HttpResult<List<TodoVO>> allTodoList() {
|
||||
String methodDescribe = getMethodDescribe("allTodoList");
|
||||
List<TodoVO> result = new ArrayList<>();
|
||||
|
||||
// 获取当前用户所有不通过的工作流程
|
||||
List<BpmProcessInstanceVO> rejectProcessInstanceList = getRejectProcessInstanceList();
|
||||
if(CollectionUtil.isNotEmpty(rejectProcessInstanceList)){
|
||||
// 转为统一的todoVO3
|
||||
result.addAll(TodoVOConvert.convertByBpmProcessInstance(rejectProcessInstanceList));
|
||||
}
|
||||
|
||||
// 获取当前用户所有待办工作流程
|
||||
HttpResult<List<BpmTaskVO>> todoAllList = this.todoAllList();
|
||||
if(CollectionUtil.isNotEmpty(todoAllList.getData())){
|
||||
// 转为统一的todoVO3
|
||||
result.addAll(TodoVOConvert.convertByBpmTaskVO(todoAllList.getData()));
|
||||
}
|
||||
|
||||
// 获取没有流程的一些待办信息
|
||||
result.addAll(businessCommonFeignClient.getTodoBusiness().getData());
|
||||
result = result.stream().sorted(Comparator.comparing(TodoVO::getTaskCreateTime).reversed()).collect(Collectors.toList());
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user