完善工时统计

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

@@ -211,7 +211,7 @@
             <if test="startModifyTime != null">
                 AND modify_time>=#{startModifyTime}
             </if>
-            <if test="startWorkTime != null">
+            <if test="startWorkDay != null">
                 AND work_day>=#{startWorkTime}
             </if>
             <if test="projectIdList != null">

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

@@ -176,7 +176,7 @@ public class StatisticsServiceImpl implements StatisticsService {
             statusArray.add(WorkOrderStatus.WAIT_AUDIT.getCode());
             statusArray.add(WorkOrderStatus.RE_SUBMIT.getCode());
             //本月未审批数量查询
-            map.put("startWorkTime", firstDayOfMonth);
+            map.put("startWorkDay", firstDayOfMonth);
             map.put("statusArray", statusArray);
 
             // 查询用户负责的项目和商机id
@@ -225,7 +225,7 @@ public class StatisticsServiceImpl implements StatisticsService {
         map.clear();
         map.put("status", StatusEnum.REJECTED.getCode());
         map.put("userId", userId);
-        map.put("startWorkTime", firstDayOfMonth);
+        map.put("startWorkDay", firstDayOfMonth);
         Integer countByCondition = workTimeOrderMapper.getCountByCondition(map);
 
         List<MonthlyWorkingHoursStatistics> monthlyWorkingHoursStatistics = workTimeOrderMapper.statisticsByProjectType(userId, firstDayOfMonth);