1.修改周工时

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

@@ -57,7 +57,7 @@ public interface ChuanyunWeekMemberHourDao extends GalaxisRepository<ChuanyunWee
             "            `status`\n" +
             "            FROM chuanyun_self_work_hour \n" +
             "            WHERE project_id !='' \n" +
-            "            AND DATE_SUB(CURDATE(), INTERVAL 61 DAY) <= date(chuanyun_self_work_hour.day_log_date)\n" +
+            "            AND DATE_SUB(CURDATE(), INTERVAL 31 DAY) <= date(chuanyun_self_work_hour.day_log_date)\n" +
             "            GROUP BY chuanyun_self_work_hour.project_id,\n" +
             "            chuanyun_self_work_hour.project_type,\n" +
             "            chuanyun_self_work_hour.user_id,\n" +
@@ -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);
 
     /**