瀏覽代碼

1.修改项目周工时汇总

WoNiu 4 年之前
父節點
當前提交
31659318eb
共有 1 個文件被更改,包括 18 次插入18 次删除
  1. 18 18
      src/main/java/com/galaxis/manatee/task/ChuanyunProjectScheduledTask.java

+ 18 - 18
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();
         //按项目汇总用户工时