|
|
@@ -238,7 +238,8 @@ public class WorkbenchManage { |
|
|
|
} |
|
|
|
vo.setProjectName(projectNameMap.get(o.getProjectCode())); |
|
|
|
return vo; |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
}).sorted(Comparator.comparing(ProjectEarlyWarningVO::getWarningTime).reversed()) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
projectEarlyWarning.setOvers(PageVo.of(overVos,overPage.getTotal())); |
|
|
|
}else{ |
|
|
|
projectEarlyWarning.setOvers(PageVo.empty()); |
|
|
@@ -261,7 +262,8 @@ public class WorkbenchManage { |
|
|
|
} |
|
|
|
vo.setProjectName(projectNameMap.get(o.getProjectCode())); |
|
|
|
return vo; |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
}).sorted(Comparator.comparing(ProjectEarlyWarningVO::getWarningTime).reversed()) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
projectEarlyWarning.setAdvents(PageVo.of(adventVos,adventPage.getTotal())); |
|
|
|
}else{ |
|
|
|
projectEarlyWarning.setAdvents(PageVo.empty()); |
|
|
@@ -284,7 +286,8 @@ public class WorkbenchManage { |
|
|
|
} |
|
|
|
vo.setProjectName(projectNameMap.get(o.getProjectCode())); |
|
|
|
return vo; |
|
|
|
}).collect(Collectors.toList()); |
|
|
|
}).sorted(Comparator.comparing(ProjectEarlyWarningVO::getId).reversed()) |
|
|
|
.collect(Collectors.toList()); |
|
|
|
projectEarlyWarning.setNormals(PageVo.of(normalVos,normalPage.getTotal())); |
|
|
|
}else{ |
|
|
|
projectEarlyWarning.setNormals(PageVo.empty()); |
|
|
|