优化代码结构

wisenergy-service/src/main/java/cn/wisenergy/service/impl/WorkTimeOrderServiceImpl.java

@@ -565,28 +565,36 @@ public class WorkTimeOrderServiceImpl implements WorkTimeOrderService {
                     }
                 }
                 if (LevelRankEnum.DEPARTMENT_LEVEL.getRank().equals(userRoleLevelDto.getRank()) || LevelRankEnum.CENTRAL_LEVEL.getRank().equals(userRoleLevelDto.getRank())) {
+
                     List<WorkTypeManager> workTypeManagers = workTypeManagerService.getByManagerId(userId);
                     if (!CollectionUtils.isEmpty(workTypeManagers)) {
                         Set<Integer> set = new TreeSet<>();
-                        workTypeManagers.forEach(type -> set.add(type.getType()));
+                        List<WorkType> managerTypes = new ArrayList<>();
+                        workTypes.forEach(type -> {
+                            if (3 == type.getReviewer()) {
+                                set.add(type.getId());
+                                managerTypes.add(type);
+                            }
+                        });
                         QueryWrapper<WorkTimeOrder> wrapper = new QueryWrapper<>();
                         wrapper.in("type", set);
                         wrapper.eq("dept_id", user.getDeptId());
                         wrapper.in("status", COMPLETED, RE_SUBMIT);
                         List<WorkTimeOrder> timeOrders = workTimeOrderMapper.selectList(wrapper);
                         ProjectManagerDto projectManagerDto1;
-                        for (WorkTypeManager workTypeManager : workTypeManagers) {
+                        for (WorkType workType : managerTypes) {
                             projectManagerDto1 = new ProjectManagerDto();
                             Integer pendingApprovalTimes = 0;
                             for (WorkTimeOrder timeOrder : timeOrders) {
-                                if (workTypeManager.getType().equals(timeOrder.getType())) {
+                                if (workType.getId()
+                                        .equals(timeOrder.getType())) {
                                     pendingApprovalTimes++;
                                 }
                             }
                             projectManagerDto1.setPendingApprovalTimes(pendingApprovalTimes);
-                            projectManagerDto1.setType(workTypeManager.getType()).setTypeName(workTypeManager.getName());
+                            projectManagerDto1.setType(workType.getId());
+                            projectManagerDto1.setTypeName(workType.getName());
                             projectManagerDtos.add(projectManagerDto1);
-
                         }
                     }
                 }