完善项目统计报表

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

@@ -158,18 +158,17 @@ public class StatisticsServiceImpl implements StatisticsService {
         Map<String, Object> map = new HashMap<>();
         // 用户有审批权限
         if (CollectionUtil.isNotEmpty(userAuthority) && userAuthority.contains(LevelEnum.EXAMINE.getLevelName())) {
-            //以审批人、审核状态、开始时间查询本月审批数量
+            // 以审批人、审核状态、开始时间查询本月审批数量
             map.put("reviewerId", userId);
             map.put("startModifyTime", firstDayOfMonth);
             Integer completedCount = workTimeOrderMapper.getCountByCondition(map);
-
-            //本月驳回未重报数量
+            // 本月驳回未重报数量
             map.put("status", WorkOrderStatus.TURN_DOWN.getCode());
             Integer rejectAndNotResubmit = workTimeOrderMapper.getCountByCondition(map);
-
             // 移除查询审批人和状态条件
             map.remove("reviewerId");
             map.remove("status");
+
             //待审核包括：新提交和重新提交的
             List<Integer> statusArray = new ArrayList<>();
             statusArray.add(WorkOrderStatus.WAIT_AUDIT.getCode());
@@ -668,7 +667,7 @@ public class StatisticsServiceImpl implements StatisticsService {
         this.conversionDateFormat(projectStatistics, deptId);
 
         // 计算项目工时和成本合计
-        for (ProjectStatisticsByMonth projectStatisticsByMonth : projectStatisticsByMonths1) {
+        for (ProjectStatisticsByMonth projectStatisticsByMonth : projectStatistics) {
             // 一条统计的
             List<ProjectStatisticsByMonth.StatisticsDateAndWorkTime> statisticsDateAndWorkTimes = projectStatisticsByMonth.getStatisticsDateAndWorkTimes();
             // 项目合计对象
@@ -686,7 +685,6 @@ public class StatisticsServiceImpl implements StatisticsService {
             statisticsDateAndWorkTime1.setCost(cost);
             statisticsDateAndWorkTimes.add(statisticsDateAndWorkTime1);
         }
-
         return projectStatistics;
     }