Selaa lähdekoodia

首页-巡检

chenshudong 2 kuukautta sitten
vanhempi
commit
714c2eec99

+ 10 - 0
airport-check/src/main/java/com/sundot/airport/check/domain/CheckLargeScreenHomePageDto.java

@@ -120,4 +120,14 @@ public class CheckLargeScreenHomePageDto {
120 120
      */
121 121
     private List<CheckLargeScreenHomePageItemDto> stationRankingList;
122 122
 
123
+    /**
124
+     * 班组排行列表-倒序
125
+     */
126
+    private List<CheckLargeScreenHomePageItemDto> reverseTeamRankingList;
127
+
128
+    /**
129
+     * 科室排行列表-倒序
130
+     */
131
+    private List<CheckLargeScreenHomePageItemDto> reverseDepartmentRankingList;
132
+
123 133
 }

+ 28 - 2
airport-check/src/main/java/com/sundot/airport/check/service/impl/CheckLargeScreenServiceImpl.java

@@ -2254,7 +2254,24 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
2254 2254
                     itemDto.setPassRate(calculate(itemListAll, item.getDeptId()));
2255 2255
                     return itemDto;
2256 2256
                 }).collect(Collectors.toList());
2257
-                result.setDepartmentRankingList(processListBest(departmentRankingList));
2257
+                List<CheckLargeScreenHomePageItemDto> departmentRankingSortList = processListBest(departmentRankingList);
2258
+                List<CheckLargeScreenHomePageItemDto> departmentRankingSortLimitList = departmentRankingSortList.stream().limit(3).peek(item -> {
2259
+                    SysDept sysDeptTeam = sysDeptService.selectDeptById(item.getId());
2260
+                    SysDept sysDeptDepartment = sysDeptService.selectDeptById(sysDeptTeam.getParentId());
2261
+                    if (ObjUtil.isNotNull(sysDeptDepartment)) {
2262
+                        item.setName(sysDeptDepartment.getDeptName() + sysDeptTeam.getDeptName());
2263
+                    }
2264
+                }).collect(Collectors.toList());
2265
+                result.setDepartmentRankingList(departmentRankingSortLimitList);
2266
+                Collections.reverse(departmentRankingSortList);
2267
+                List<CheckLargeScreenHomePageItemDto> reverseDepartmentRankingList = departmentRankingSortList.stream().limit(3).peek(item -> {
2268
+                    SysDept sysDeptTeam = sysDeptService.selectDeptById(item.getId());
2269
+                    SysDept sysDeptDepartment = sysDeptService.selectDeptById(sysDeptTeam.getParentId());
2270
+                    if (ObjUtil.isNotNull(sysDeptDepartment)) {
2271
+                        item.setName(sysDeptDepartment.getDeptName() + sysDeptTeam.getDeptName());
2272
+                    }
2273
+                }).collect(Collectors.toList());
2274
+                result.setReverseDepartmentRankingList(reverseDepartmentRankingList);
2258 2275
 
2259 2276
                 List<SysDept> teamDeptList = deptList.stream().filter(item -> StrUtil.equals(DeptType.TEAMS.getCode(), item.getDeptType())).collect(Collectors.toList());
2260 2277
                 List<CheckLargeScreenHomePageItemDto> teamRankingList = teamDeptList.stream().map(item -> {
@@ -2265,7 +2282,7 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
2265 2282
                     return itemDto;
2266 2283
                 }).collect(Collectors.toList());
2267 2284
                 List<CheckLargeScreenHomePageItemDto> teamRankingSortList = processListBest(teamRankingList);
2268
-                List<CheckLargeScreenHomePageItemDto> teamRankingSortLimitList = teamRankingSortList.stream().limit(5).peek(item -> {
2285
+                List<CheckLargeScreenHomePageItemDto> teamRankingSortLimitList = teamRankingSortList.stream().limit(3).peek(item -> {
2269 2286
                     SysDept sysDeptTeam = sysDeptService.selectDeptById(item.getId());
2270 2287
                     SysDept sysDeptDepartment = sysDeptService.selectDeptById(sysDeptTeam.getParentId());
2271 2288
                     if (ObjUtil.isNotNull(sysDeptDepartment)) {
@@ -2273,6 +2290,15 @@ public class CheckLargeScreenServiceImpl implements ICheckLargeScreenService {
2273 2290
                     }
2274 2291
                 }).collect(Collectors.toList());
2275 2292
                 result.setTeamRankingList(teamRankingSortLimitList);
2293
+                Collections.reverse(teamRankingSortList);
2294
+                List<CheckLargeScreenHomePageItemDto> reverseTeamRankingList = teamRankingSortList.stream().limit(3).peek(item -> {
2295
+                    SysDept sysDeptTeam = sysDeptService.selectDeptById(item.getId());
2296
+                    SysDept sysDeptDepartment = sysDeptService.selectDeptById(sysDeptTeam.getParentId());
2297
+                    if (ObjUtil.isNotNull(sysDeptDepartment)) {
2298
+                        item.setName(sysDeptDepartment.getDeptName() + sysDeptTeam.getDeptName());
2299
+                    }
2300
+                }).collect(Collectors.toList());
2301
+                result.setReverseTeamRankingList(reverseTeamRankingList);
2276 2302
             } else {
2277 2303
             }
2278 2304
         }