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 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)
+    @Query(value="SELECT * FROM chuanyun_self_cost WHERE 1=1 AND DATE_FORMAT( chuanyun_self_cost.day_log_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )"
+            ,countQuery="SELECT COUNT(1) FROM chuanyun_self_cost WHERE 1=1 AND DATE_FORMAT( chuanyun_self_cost.day_log_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )",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 1=1 AND CONCAT(chuanyun_week_member_hour.`year`,chuanyun_week_member_hour.`week`)>=202050 ",
-            countQuery="SELECT COUNT(1) FROM chuanyun_week_member_hour WHERE 1=1 AND CONCAT(chuanyun_week_member_hour.`year`,chuanyun_week_member_hour.`week`)>=202050",nativeQuery = true)
+    @Query(value="SELECT * FROM chuanyun_week_member_hour WHERE 1=1 AND CONCAT(chuanyun_week_member_hour.`year`,chuanyun_week_member_hour.`week`)>=(YEARWEEK(NOW(),1)-4) ",
+            countQuery="SELECT COUNT(1) FROM chuanyun_week_member_hour WHERE 1=1 AND CONCAT(chuanyun_week_member_hour.`year`,chuanyun_week_member_hour.`week`)>=(YEARWEEK(NOW(),1)-4) ",nativeQuery = true)
     Page<ChuanyunWeekMemberHourDO> getRecentlyWeekHour(PageRequest pagerequest);
 
     /**