完善工时统计

wisenergy-mapper/src/main/resources/mapper/WorkTypeManagerMapper.xml

@@ -4,7 +4,7 @@
 
 
     <select id="getListByManagerId" resultType="cn.wisenergy.model.app.WorkTypeManager">
-        select id, name,dept_id,manager_id,type
+        select id,dept_id,manager_id,type
         from work_type_manager
         where manager_id = #{userId}
     </select>

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

@@ -41,13 +41,13 @@ public class MonthlyWorkingHoursStatistics implements Serializable ,Comparable{
      * 填报次数
      */
     @ApiModelProperty(name = "count", value = "填报次数")
-    private int count;
+    private Integer count;
 
     /**
      * 填报工时
      */
     @ApiModelProperty(name = "workTime", value = "合计填报工时")
-    private int workTime;
+    private Integer workTime;
 
     @Override
     public int compareTo(Object o) {

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

@@ -183,15 +183,17 @@ public class StatisticsServiceImpl implements StatisticsService {
             Integer notCompletedCount1 = workTimeOrderMapper.getCountByCondition(map);
 
             // 查询用户负责审批的除项目合商机的其余类型
+            Integer notCompletedCount2 = 0;
             List<WorkTypeManager> workTypeManagers = workTypeManagerMapper.getListByManagerId(userId);
             if (CollectionUtil.isNotEmpty(workTypeManagers)) {
                 map.remove("projectIdList");
                 List<Integer> type = workTypeManagers.stream().map(WorkTypeManager::getType).collect(Collectors.toList());
                 map.put("typeList", type);
                 map.put("deptId", user.getDeptId());
-            }
                 // 其余类型为审批的条数
-            Integer notCompletedCount2 = workTimeOrderMapper.getCountByCondition(map);
+                notCompletedCount2 = workTimeOrderMapper.getCountByCondition(map);
+            }
+
 
             //所有查询结果封装进对象
             ApprovalStatistics approvalStatistics = new ApprovalStatistics();