1.修改周工时

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

@@ -48,22 +48,22 @@ public interface ChuanyunWeekMemberHourDao extends GalaxisRepository<ChuanyunWee
      * 获取最近一个月周工时
      * @return
      */
-    @Query(value="SELECT chuanyun_self_work_hour.object_id," +
-            "DATE_FORMAT(day_log_date,'%Y') as year," +
-            "WEEKOFYEAR(chuanyun_self_work_hour.day_log_date) AS week," +
-            "project_id,user_id," +
-            "SUM(standard_work_hour)AS standard_work_hour," +
-            "project_type," +
-            "`status`" +
-            "FROM chuanyun_self_work_hour " +
-            "WHERE project_id !='' " +
-            "AND DATE_SUB(CURDATE(), INTERVAL 60 DAY) <= date(day_log_date) " +
-            "GROUP BY chuanyun_self_work_hour.project_id," +
-            "chuanyun_self_work_hour.project_type," +
-            "chuanyun_self_work_hour.user_id," +
-            "DATE_FORMAT(day_log_date,'%Y')," +
-            "WEEKOFYEAR(chuanyun_self_work_hour.day_log_date)," +
-            "chuanyun_self_work_hour.`status`",nativeQuery = true)
+    @Query(value="SELECT chuanyun_self_work_hour.object_id,\n" +
+            "            LEFT(YEARWEEK(chuanyun_self_work_hour.day_log_date,1),4)as year,\n" +
+            "            RIGHT(YEARWEEK(chuanyun_self_work_hour.day_log_date,1),2) AS week,\n" +
+            "            project_id,user_id,\n" +
+            "            SUM(standard_work_hour)AS standard_work_hour,\n" +
+            "            project_type,\n" +
+            "            `status`\n" +
+            "            FROM chuanyun_self_work_hour \n" +
+            "            WHERE project_id !='' \n" +
+            "            AND DATE_FORMAT( chuanyun_self_work_hour.day_log_date, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' )\n" +
+            "            GROUP BY chuanyun_self_work_hour.project_id,\n" +
+            "            chuanyun_self_work_hour.project_type,\n" +
+            "            chuanyun_self_work_hour.user_id,\n" +
+            "            LEFT(YEARWEEK(chuanyun_self_work_hour.day_log_date,1),4),\n" +
+            "            RIGHT(YEARWEEK(chuanyun_self_work_hour.day_log_date,1),2),\n" +
+            "            chuanyun_self_work_hour.`status`",nativeQuery = true)
     List<ChuanyunWeekMemberHourDO> getWeekMemberHourRecently();