1.调整了部分标准化工时部分代码结构

src/main/java/com/galaxis/manatee/service/LogStandardService.java

@@ -65,6 +65,15 @@ public class LogStandardService {
     }
 
     /**
+     * 标准化最近一个月每周工时
+     */
+    @Async
+    public void standardWeekMemberHourRecent(){
+        List<ChuanyunWeekMemberHourDO> list = chuanyunWeekMemberHourDao.getWeekMemberHourRecently();
+        this.generateWeekMemberHourByWeekMemberHourList(list);
+    }
+
+    /**
      * 根据用户Id标准化某个人的日工时
      * @param userId    用户Id
      */
@@ -143,7 +152,7 @@ public class LogStandardService {
      * 根据日工时列表生成
      * @param updateList    待更新列表
      */
-    public void generateSelfWorkHourByWorkHourList(List<ChuanyunWorkHourDO> updateList){
+    private void generateSelfWorkHourByWorkHourList(List<ChuanyunWorkHourDO> updateList){
         //逐一将原始工时数据标准化后，更新到标准化工时表和氚云中
         updateList.forEach(self -> {
             try {
@@ -171,7 +180,7 @@ public class LogStandardService {
      * 根据周工时列表
      * @param updateList    待更新的周工时列表
      */
-    public void generateWeekMemberHourByWeekMemberHourList(List<ChuanyunWeekMemberHourDO> updateList){
+    private void generateWeekMemberHourByWeekMemberHourList(List<ChuanyunWeekMemberHourDO> updateList){
         updateList.forEach(chuanyunWeekMemberHourDO -> {
             try{
                 if (chuanyunWeekMemberHourDO!=null){

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

@@ -30,16 +30,14 @@ public class WorkHourStatisticsRecently {
     private final ChuanyunLogDao chuanyunLogDao;
     private final ChuanyunGroupProjectDao chuanyunGroupProjectDao;
     private final ChuanyunUserCompanyDao chuanyunUserCompanyDao;
-    private final ChuanyunWeekMemberHourDao chuanyunWeekMemberHourDao;
     private final ChuanyunUserDepartmentNameDao chuanyunUserDepartmentNameDao;
     private final LogStandardService logStandardService;
 
-    public WorkHourStatisticsRecently(ChuanYunManager chuanYunManager, ChuanyunLogDao chuanyunLogDao, ChuanyunGroupProjectDao chuanyunGroupProjectDao, ChuanyunUserCompanyDao chuanyunUserCompanyDao, ChuanyunWeekMemberHourDao chuanyunWeekMemberHourDao, ChuanyunUserDepartmentNameDao chuanyunUserDepartmentNameDao, LogStandardService logStandardService) {
+    public WorkHourStatisticsRecently(ChuanYunManager chuanYunManager, ChuanyunLogDao chuanyunLogDao, ChuanyunGroupProjectDao chuanyunGroupProjectDao, ChuanyunUserCompanyDao chuanyunUserCompanyDao, ChuanyunUserDepartmentNameDao chuanyunUserDepartmentNameDao, LogStandardService logStandardService) {
         this.chuanYunManager = chuanYunManager;
         this.chuanyunLogDao = chuanyunLogDao;
         this.chuanyunGroupProjectDao = chuanyunGroupProjectDao;
         this.chuanyunUserCompanyDao = chuanyunUserCompanyDao;
-        this.chuanyunWeekMemberHourDao = chuanyunWeekMemberHourDao;
         this.chuanyunUserDepartmentNameDao = chuanyunUserDepartmentNameDao;
         this.logStandardService = logStandardService;
     }
@@ -179,8 +177,7 @@ public class WorkHourStatisticsRecently {
         long start=Instant.now().getEpochSecond();
         //更新数据库
         log.info("开始最近周工时标准化");
-        List<ChuanyunWeekMemberHourDO> list = chuanyunWeekMemberHourDao.getWeekMemberHourRecently();
-        logStandardService.generateWeekMemberHourByWeekMemberHourList(list);
+        logStandardService.standardWeekMemberHourRecent();
         log.info("最近周工时标准化"+(Instant.now().getEpochSecond()-start)+"秒");
     }
 
@@ -199,21 +196,13 @@ public class WorkHourStatisticsRecently {
                 page += 1;
                 List<ChuanyunUserCompanyDO> userCompanyDOList = chuanyunUserCompanyList.getContent();
                 //单项目单人单月成本
-                userCompanyDOList.forEach(this::standardMonthlyHour);
+                userCompanyDOList.forEach(chuanyunUserCompanyDO ->  logStandardService.standardSelfCostByUserId(chuanyunUserCompanyDO.getUserId()));
             }else {
                 flag = false;
             }
         }
     }
 
-    /**
-     * 员工每月、各个项目标准工时会职工
-     * @param chuanyunUserCompanyDO 员工信息
-     */
-    private void standardMonthlyHour(ChuanyunUserCompanyDO chuanyunUserCompanyDO) {
-        logStandardService.standardSelfCostByUserId(chuanyunUserCompanyDO.getUserId());
-    }
-
     private String getCharacters(String str){
         String reg = "[^\u4e00-\u9fa5]";
         str = str.replaceAll(reg, " ");