待办中心、项目库导出修改

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -262,7 +262,17 @@ public class TodoCenterManage {
             req.setUserId(String.valueOf(userId));
             req.setEmployeeCode(employeeCode);
             BeanUtils.copyProperties(param,req);
-            userTodoList = processTaskService.getUserTodoList(req);
+
+            //有待办节点的(不包含退回)
+            List<ProcessTaskVo> todoList = processTaskService.getUserTodoList(req);
+            //有退回待办的
+            List<ProcessTaskVo> backList = processTaskService.getBackTodoList(req);
+            //合并 并且排序
+            userTodoList = Stream.concat(todoList.stream(),backList.stream())
+                    .filter(Objects::nonNull)
+                    .sorted(Comparator.comparing(ProcessTaskVo::getTaskCreateTime)
+                            .reversed())
+                    .collect(Collectors.toList());
         }
 
         ExcelExportWriter excelExportWriter = new ExcelExportWriter();