完善工时统计

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

@@ -513,7 +513,6 @@ public class StatisticsServiceImpl implements StatisticsService {
         List<Integer> role = UserRoleLevelUtils.getRole(userId);
         // 判断是否有该权限
         UserRoleLevelUtils.isManagerLevel(userId,LevelEnum.PROJECT_STATITSTICS.getLevelName());
-
         // 获取用户信息
         WorkUser user = workUserService.getById(userId);
         // 获取用户权限的级别
@@ -547,8 +546,9 @@ public class StatisticsServiceImpl implements StatisticsService {
             // 查询部门下所有项目，部门主键是用户的部门主键,当前权限最高级别为部门级别
             map.put("deptId", user.getDeptId());
             userManageProjects = workProjectMapper.getListByCriteria(map);
+        }else {
             map.put("managerId", user.getId());
-            workProjectMapper.getListByCriteria(map);
+            userManageProjects = workProjectMapper.getListByCriteria(map);
         }
 
         // 管理项目为空则提前结束
@@ -569,6 +569,9 @@ public class StatisticsServiceImpl implements StatisticsService {
                 queryType.add(type.getId());
             }
         }
+        // 查询各个项目下所有人的加班工时和平常工时
+        List<UserWorkTimeStatisticsByProject> userProjectWorkTimeStatistics1 = workTimeOrderMapper.getUserProjectWorkTimeStatistics(startDate, endDate, projectIds, true);
+
         // 部门级别以上的用户可以查询所管理项目的成员所填的其他类型的工单
         List<Integer> userIds = workUserProjectMapper.selectUserIdByProjectIds(projectIds);
         if (rank.contains(LevelRankEnum.DEPARTMENT_LEVEL.getRank()) || rank.contains(LevelRankEnum.CENTRAL_LEVEL.getRank())) {
@@ -576,9 +579,6 @@ public class StatisticsServiceImpl implements StatisticsService {
             if (CollectionUtil.isNotEmpty(userWorkTimeStatisticsByProjectList)) {
                 userProjectWorkTimeStatistics.get(0).getProjectWorkTimeAndType().addAll(userWorkTimeStatisticsByProjectList.get(0).getProjectWorkTimeAndType());
             }
-        }
-        // 查询各个项目下所有人的加班工时和平常工时
-        List<UserWorkTimeStatisticsByProject> userProjectWorkTimeStatistics1 = workTimeOrderMapper.getUserProjectWorkTimeStatistics(startDate, endDate, projectIds, true);
             // 查询各个项目下所有人的其他除了项目、商机、请假、调休类型的加班工时和平常工时
             List<UserWorkTimeStatisticsByProject> userWorkTimeStatisticsByProjects = workTimeOrderMapper.selectListByType(startDate, endDate, queryType, userIds, true);
             for (UserWorkTimeStatisticsByProject userWorkTimeStatisticsByProject : userWorkTimeStatisticsByProjects) {
@@ -588,6 +588,7 @@ public class StatisticsServiceImpl implements StatisticsService {
                     }
                 }
             }
+        }
         userProjectWorkTimeStatistics.addAll(userProjectWorkTimeStatistics1);
 
         // 取出单人的项目工时统计