1.修改周工时

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 chuanyun_week_member_hour.`week` >= IF((WEEKOFYEAR(NOW()) - 2)<0,48,(WEEKOFYEAR(NOW()) - 2))AND chuanyun_week_member_hour.`year` =  IF((WEEKOFYEAR(NOW()) - 2)<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)
+    @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)
     Page<ChuanyunWeekMemberHourDO> getRecentlyWeekHour(PageRequest pagerequest);
 
     /**