1.修改月工时

src/main/java/com/galaxis/manatee/dao/ChuanyunSelfCostDao.java

@@ -36,8 +36,8 @@ public interface ChuanyunSelfCostDao extends GalaxisRepository<ChuanyunSelfCostD
      * @param pagerequest
      * @return
      */
-    @Query(value="SELECT * FROM chuanyun_self_cost WHERE MONTH(chuanyun_self_cost.day_log_date)>=(MONTH(NOW())-1) AND YEAR(chuanyun_self_cost.day_log_date)=YEAR(NOW())"
-            ,countQuery="SELECT COUNT(1) FROM chuanyun_self_cost WHERE MONTH(chuanyun_self_cost.day_log_date)>=(MONTH(NOW())-1) AND YEAR(chuanyun_self_cost.day_log_date)=YEAR(NOW())",nativeQuery = true)
+    @Query(value="SELECT * FROM chuanyun_self_cost WHERE 1=1 AND MONTH(chuanyun_self_cost.day_log_date)>= IF((MONTH(NOW())-1)<=0,12,(MONTH(NOW())-1)) AND  YEAR(chuanyun_self_cost.day_log_date)= IF((MONTH(NOW())-1)<=0,YEAR(NOW())-1,YEAR(NOW()))"
+            ,countQuery="SELECT COUNT(1) FROM chuanyun_self_cost WHERE 1=1 AND MONTH(chuanyun_self_cost.day_log_date)>= IF((MONTH(NOW())-1)<=0,12,(MONTH(NOW())-1)) AND  YEAR(chuanyun_self_cost.day_log_date)= IF((MONTH(NOW())-1)<=0,YEAR(NOW())-1,YEAR(NOW()))",nativeQuery = true)
     Page<ChuanyunSelfCostDO> getRecentlyMonthHour(PageRequest pagerequest);
 
     /**

src/main/java/com/galaxis/manatee/dao/ChuanyunWeekMemberHourDao.java

@@ -73,8 +73,8 @@ public interface ChuanyunWeekMemberHourDao extends GalaxisRepository<ChuanyunWee
      * @param pagerequest
      * @return
      */
-    @Query(value="SELECT * FROM chuanyun_week_member_hour WHERE chuanyun_week_member_hour.`week` >= (WEEKOFYEAR(NOW())-4) AND chuanyun_week_member_hour.`year`=YEAR(NOW())",
-            countQuery="SELECT COUNT(1) FROM chuanyun_week_member_hour WHERE chuanyun_week_member_hour.`week` >= (WEEKOFYEAR(NOW())-4) AND chuanyun_week_member_hour.`year`=YEAR(NOW())",nativeQuery = true)
+    @Query(value="SELECT * FROM chuanyun_week_member_hour WHERE 1=1 AND chuanyun_week_member_hour.`week` >= IF((WEEKOFYEAR(NOW()) - 4)<0,48,(WEEKOFYEAR(NOW()) - 4))AND chuanyun_week_member_hour.`year` =  IF((WEEKOFYEAR(NOW()) - 4)<0,YEAR (NOW())-1,YEAR (NOW()))",
+            countQuery="SELECT COUNT(1) FROM chuanyun_week_member_hour WHERE 1=1 AND chuanyun_week_member_hour.`week` >= IF((WEEKOFYEAR(NOW()) - 4)<0,48,(WEEKOFYEAR(NOW()) - 4))AND chuanyun_week_member_hour.`year` =  IF((WEEKOFYEAR(NOW()) - 4)<0,YEAR (NOW())-1,YEAR (NOW()))",nativeQuery = true)
     Page<ChuanyunWeekMemberHourDO> getRecentlyWeekHour(PageRequest pagerequest);
 
     /**

src/main/java/com/galaxis/manatee/task/WorkHourStatisticsRecently.java

@@ -358,7 +358,6 @@ public class WorkHourStatisticsRecently {
             if (page<=updateList.getTotalPages()){
                 page += 1;
                 updateList.getContent().forEach(chuanyunWeekMemberHourDO -> {
-//                    log.info("------周工时-----------"+chuanyunWeekMemberHourDO);
                     //更新氚云
                     try {
                         String departmentId=chuanyunUserCompanyDao.findByUserId(chuanyunWeekMemberHourDO.getUserId()).getDepartmentId();