1.修改项目周工时汇总

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

@@ -16,7 +16,7 @@ public interface ChuanyunWeekMemberHourDao extends GalaxisRepository<ChuanyunWee
      * @return
      */
     @Query(value="SELECT chuanyun_self_work_hour.object_id,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 !='' GROUP BY chuanyun_self_work_hour.project_id,chuanyun_self_work_hour.user_id,WEEKOFYEAR(chuanyun_self_work_hour.day_log_date)",nativeQuery = true)
+            "FROM chuanyun_self_work_hour WHERE project_id !='' GROUP BY chuanyun_self_work_hour.project_id,chuanyun_self_work_hour.user_id,WEEKOFYEAR(chuanyun_self_work_hour.day_log_date),chuanyun_self_work_hour.`status`",nativeQuery = true)
     List<ChuanyunWeekMemberHourDO> getWeekMemberHour();
 
     /**
@@ -26,5 +26,5 @@ public interface ChuanyunWeekMemberHourDao extends GalaxisRepository<ChuanyunWee
      * @param week
      * @return
      */
-    ChuanyunWeekMemberHourDO findByProjectIdAndUserIdAndWeek(String projectId,String userId,String week);
+    ChuanyunWeekMemberHourDO findByProjectIdAndUserIdAndWeekAndStatusAndProjectType(String projectId,String userId,String week,String status,String projectType);
 }

src/main/java/com/galaxis/manatee/task/ChuanyunProjectScheduledTask.java

@@ -279,24 +279,24 @@ public class ChuanyunProjectScheduledTask {
         var flag = true;
         var pageSize = 20;
         var page = 0;
-        while(flag) {
-            var pageable= PageRequest.of(page,pageSize);
-            var chuanyunUserCompanyList = chuanyunUserCompanyDao.findAllByStatus(1,pageable);
-            if (page<=chuanyunUserCompanyList.getTotalPages()){
-                page += 1;
-            }else {
-                flag = false;
-                break;
-            }
-            //逐个将员工每天工时进行统计汇总
-            List<ChuanyunUserCompanyDO> userCompanyDOList = chuanyunUserCompanyList.getContent();
-            userCompanyDOList.forEach(chuanyunUserCompanyDO -> {
-                //工时标准化
-                standardHour(chuanyunUserCompanyDO);
-                //单项目单人单月成本
-                standardMonthlyHour(chuanyunUserCompanyDO);
-            });
-        }
+//        while(flag) {
+//            var pageable= PageRequest.of(page,pageSize);
+//            var chuanyunUserCompanyList = chuanyunUserCompanyDao.findAllByStatus(1,pageable);
+//            if (page<=chuanyunUserCompanyList.getTotalPages()){
+//                page += 1;
+//            }else {
+//                flag = false;
+//                break;
+//            }
+//            //逐个将员工每天工时进行统计汇总
+//            List<ChuanyunUserCompanyDO> userCompanyDOList = chuanyunUserCompanyList.getContent();
+//            userCompanyDOList.forEach(chuanyunUserCompanyDO -> {
+//                //工时标准化
+//                standardHour(chuanyunUserCompanyDO);
+//                //单项目单人单月成本
+//                standardMonthlyHour(chuanyunUserCompanyDO);
+//            });
+//        }
         //人员项目周工时汇总
         weekhour();
         //按项目汇总用户工时
@@ -321,7 +321,7 @@ public class ChuanyunProjectScheduledTask {
                weekMemberHourDO.setStatus(chuanyunWeekMemberHourDO.getStatus());
                weekMemberHourDO.setUserId(chuanyunWeekMemberHourDO.getUserId());
                weekMemberHourDO.setWeek(chuanyunWeekMemberHourDO.getWeek());
-               ChuanyunWeekMemberHourDO oldWeekHour = chuanyunWeekMemberHourDao.findByProjectIdAndUserIdAndWeek(chuanyunWeekMemberHourDO.getProjectId(),chuanyunWeekMemberHourDO.getUserId(),chuanyunWeekMemberHourDO.getWeek());
+               ChuanyunWeekMemberHourDO oldWeekHour = chuanyunWeekMemberHourDao.findByProjectIdAndUserIdAndWeekAndStatusAndProjectType(chuanyunWeekMemberHourDO.getProjectId(),chuanyunWeekMemberHourDO.getUserId(),chuanyunWeekMemberHourDO.getWeek(),chuanyunWeekMemberHourDO.getStatus(),chuanyunWeekMemberHourDO.getProjectType());
                if (oldWeekHour != null) {
                    chuanyunWeekMemberHourDao.delete(oldWeekHour);
                }