Browse Source

待办逻辑查询修改

master
PoffyZhang 1 year ago
parent
commit
0467d32f9b
2 changed files with 7 additions and 2 deletions
  1. +2
    -2
      pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java
  2. +5
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

+ 2
- 2
pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java View File

@@ -293,8 +293,8 @@ public class DeclaredProjectManage {
projectInst.setInstType(ProjectProcessStageEnum.ORG_INTERNAL_APPROVAL_PROCESS.getCode());
projectInstService.save(projectInst);
} catch (Exception e) {
log.error("项目信息入库错误 ", e);
throw new BusinessException("项目信息入库错误 :" + e.getMessage());
log.error("项目信息入库错误 " + e);
throw new BusinessException("项目信息入库错误 :" + e);
}
return Boolean.TRUE;
}


+ 5
- 0
pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java View File

@@ -177,7 +177,12 @@ public class TodoCenterManage {
req.setProcessDefId(param.getProcessDefId());
req.setUserId(String.valueOf(userId));
req.setEmployeeCode(employeeCode);
//有待办节点的(不包含退回)
List<ProcessTaskVo> todoList = processTaskService.getUserTodoList(req);
//有退回待办的
List<ProcessTaskVo> backList = processTaskService.getBackTodoList(req);
todoList.addAll(backList);
todoList.stream().sorted(Comparator.comparing(ProcessTaskVo::getTaskCreateTime).reversed());

if (CollUtil.isEmpty(todoList)) {
return PageVo.empty();


Loading…
Cancel
Save