完善工时统计

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

@@ -572,11 +572,13 @@ public class StatisticsServiceImpl implements StatisticsService {
         // 所有项目的统计
         map.put("isAll", false);
         userProjectWorkTimeStatistics = workTimeOrderMapper.getUserProjectWorkTimeStatistics(map);
+
         // 给返回前端的数据补全所有项目
         if (CollectionUtil.isNotEmpty(projects)) {
             // 如果查询所有项目的统计为空，给集合里添加个元素
             if (CollectionUtil.isEmpty(userProjectWorkTimeStatistics)) {
                 UserWorkTimeStatisticsByProject userWorkTimeStatisticsByProject = new UserWorkTimeStatisticsByProject();
+                userWorkTimeStatisticsByProject.setUserName("合计");
                 List<ProjectWorkTimeAndType> projectWorkTimeAndTypes = new ArrayList<>();
                 userWorkTimeStatisticsByProject.setProjectWorkTimeAndType(projectWorkTimeAndTypes);
                 userProjectWorkTimeStatistics.add(userWorkTimeStatisticsByProject);
@@ -636,9 +638,6 @@ public class StatisticsServiceImpl implements StatisticsService {
             }
 
 
-
-
-
             // 缺少类型，造对象传前端
             UserWorkTimeStatisticsByProject userWorkTimeStatisticsByProject1 = new UserWorkTimeStatisticsByProject();
             List<ProjectWorkTimeAndType> projectWorkTimeAndTypes = new ArrayList<>();
@@ -803,12 +802,9 @@ public class StatisticsServiceImpl implements StatisticsService {
             }
         }
 
-        // 将查询结果封装在一起，部门主键为空，项目总计在前，否则在后
-        if (deptId == null) {
-            projectStatisticsByMonths.addAll(projectStatisticsByMonths1);
-        } else {
-            projectStatisticsByMonths.addAll(0, projectStatisticsByMonths1);
-        }
+        // 将查询结果封装在一起
+        projectStatisticsByMonths.addAll(0,projectStatisticsByMonths1);
+
         List<String> yearMonthList = new ArrayList<>();
         if (projectId != null) {
             // 整个项目所占时间，未结项目截止时间为当月，已结项目截止时间为最后一次统计的时间
@@ -946,7 +942,10 @@ public class StatisticsServiceImpl implements StatisticsService {
 
                 for (int i = 0; i < yearMonthList.size(); i++) {
                     String s = yearMonthList.get(i);
-                    String date = statisticsDateAndWorkTimes.get(i).getDate();
+                    String date = "";
+                    if (i < statisticsDateAndWorkTimes.size()) {
+                        date = statisticsDateAndWorkTimes.get(i).getDate();
+                    }
                     if (!s.equals(date)) {
                         ProjectStatisticsByMonth.StatisticsDateAndWorkTime statisticsDateAndWorkTime = new ProjectStatisticsByMonth.StatisticsDateAndWorkTime();
                         statisticsDateAndWorkTime.setDate(s);
@@ -959,7 +958,7 @@ public class StatisticsServiceImpl implements StatisticsService {
                     try {
                         parse = format.parse(s);
                         if (DateUtil.getMonth(parse) != 1 && i != 0) {
-                            String s1 = yearMonthList.get(i);
+                            String s1 = yearMonthList.get(i-1);
                             String substring = s1.substring(5);
                             statisticsDateAndWorkTimes.get(i).setDate(substring);
                         }