完善工时统计

wisenergy-model/src/main/java/cn/wisenergy/model/dto/ProjectWorkTimeAndType.java

@@ -31,7 +31,7 @@ public class ProjectWorkTimeAndType{
      * 加班工时
      */
     @ApiModelProperty(name = "isOvertime", value = "加班工时")
-    private Integer overtime;
+    private Integer overTime;
 
     /**
      * 加班工时

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

@@ -611,7 +611,7 @@ public class StatisticsServiceImpl implements StatisticsService {
                 if (!collect.contains(types.get(i).getId())) {
                     ProjectWorkTimeAndType projectWorkTimeAndType = new ProjectWorkTimeAndType();
                     projectWorkTimeAndType.setNormalTime(0);
-                    projectWorkTimeAndType.setOvertime(0);
+                    projectWorkTimeAndType.setOverTime(0);
                     projectWorkTimeAndType.setProjectType(types.get(i).getId());
                     projectWorkTimeAndType.setProjectName(types.get(i).getName());
                     projectWorkTimeAndTypes.add(projectWorkTimeAndType);
@@ -646,7 +646,7 @@ public class StatisticsServiceImpl implements StatisticsService {
                 ProjectWorkTimeAndType projectWorkTimeAndType3 = projectWorkTimeAndType1.get(i - 1);
                 String projectName1 = projectWorkTimeAndType3.getProjectName();
                 if (projectName.equals(projectName1)) {
-                    projectWorkTimeAndType1.get(i - 1).setOvertime(projectWorkTimeAndType2.getOvertime());
+                    projectWorkTimeAndType1.get(i - 1).setOverTime(projectWorkTimeAndType2.getOverTime());
                     projectWorkTimeAndType1.remove(i);
                 }
                 // 获取前一个对象
@@ -654,19 +654,21 @@ public class StatisticsServiceImpl implements StatisticsService {
                 if (projectWorkTimeAndTypes.getNormalTime() != null) {
                     totalTime += projectWorkTimeAndTypes.getNormalTime();
                 }
-                if (projectWorkTimeAndTypes.getOvertime()!=null) {
-                    totalTime += projectWorkTimeAndTypes.getOvertime();
+                if (projectWorkTimeAndTypes.getOverTime()!=null) {
+                    totalTime += projectWorkTimeAndTypes.getOverTime();
                 }
             }
             // 最后一个对象
-            ProjectWorkTimeAndType projectWorkTimeAndTypes = projectWorkTimeAndType1.get(projectWorkTimeAndType1.size()-1);
-            if (projectWorkTimeAndTypes.getOvertime()!=null) {
-                totalTime += projectWorkTimeAndTypes.getOvertime();
-            }
-            if (projectWorkTimeAndTypes.getNormalTime() != null) {
-                totalTime += projectWorkTimeAndTypes.getNormalTime();
-            }
 
+            if (projectWorkTimeAndType1.size() != 0) {
+                ProjectWorkTimeAndType projectWorkTimeAndTypes =  projectWorkTimeAndType1.get(projectWorkTimeAndType1.size()-1);
+                if (projectWorkTimeAndTypes.getOverTime()!=null) {
+                    totalTime += projectWorkTimeAndTypes.getOverTime();
+                }
+                if (projectWorkTimeAndTypes.getNormalTime() != null) {
+                    totalTime += projectWorkTimeAndTypes.getNormalTime();
+                }
+            }
             userProjectWorkTimeStatistic.setTotalTime(totalTime);
         }