1.修改月工时

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

@@ -30,6 +30,13 @@ public interface ChuanyunSelfWorkHourDao extends GalaxisRepository<ChuanyunSelfW
     ChuanyunSelfWorkHourDO findByUserIdAndAndProjectIdAndAndDayLogDateAndProjectType(String userId, String projectId, LocalDateTime dayLogDate,String projectType);
 
     /**
+     * 根据userId获取工时数据
+     * @param userId
+     * @return
+     */
+    List<ChuanyunSelfWorkHourDO> findByUserId(String userId);
+
+    /**
      * 根据用户id，日期获取工时
      * @param userId
      * @param dayLogDate
@@ -98,8 +105,7 @@ public interface ChuanyunSelfWorkHourDao extends GalaxisRepository<ChuanyunSelfW
             "chuanyun_self_work_hour.object_id " +
             "FROM chuanyun_self_work_hour " +
             "WHERE chuanyun_self_work_hour.user_id=? " +
-            "AND MONTH(chuanyun_self_work_hour.day_log_date)>=(MONTH(NOW())-1) " +
-            "AND YEAR(chuanyun_self_work_hour.day_log_date)=YEAR(NOW()) " +
+            "AND DATE_SUB(CURDATE(), INTERVAL 2 MONTH) <= date(day_log_date) " +
             "GROUP BY chuanyun_self_work_hour.user_id," +
             "DATE_FORMAT(chuanyun_self_work_hour.day_log_date,'%Y-%m')," +
             "chuanyun_self_work_hour.project_id," +

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

@@ -57,9 +57,7 @@ public interface ChuanyunWeekMemberHourDao extends GalaxisRepository<ChuanyunWee
             "`status`" +
             "FROM chuanyun_self_work_hour " +
             "WHERE project_id !='' " +
-            "AND WEEKOFYEAR(chuanyun_self_work_hour.day_log_date)>=(WEEKOFYEAR(NOW())-4)" +
-            "AND DATE_FORMAT(day_log_date,'%Y')=YEAR(NOW()) " +
-            "and LENGTH(user_id) = CHAR_LENGTH(user_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," +