瀏覽代碼

1.更新日工时统计

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

+ 4 - 3
src/main/java/com/galaxis/manatee/task/WorkHourStatisticsRecently.java

@@ -158,7 +158,6 @@ public class WorkHourStatisticsRecently {
                     long start= Instant.now().getEpochSecond();
                     //工时标准化
                     standardHour(chuanyunUserCompanyDO);
-//                    log.info("每日工时标准化"+chuanyunUserCompanyDO.getUserName()+(Instant.now().getEpochSecond()-start)+"秒");
                 });
             }else {
                 break;
@@ -229,10 +228,12 @@ public class WorkHourStatisticsRecently {
                 page += 1;
                 updateList.forEach(chuanyunSelfWorkHourDO -> {
                     try{
-                        String departmentId=chuanyunUserCompanyDao.findAllByUserId(chuanyunSelfWorkHourDO.getUserId()).get(0).getDepartmentId();
+                        ChuanyunUserCompanyDO chuanyunUserCompanyDO =chuanyunUserCompanyDao.findByUserId(chuanyunSelfWorkHourDO.getUserId());
                         WorkHourStatistics.ChuanyunSelfWorkHourDTO chuanyunSelfWorkHourDTO = new WorkHourStatistics.ChuanyunSelfWorkHourDTO();
                         BeanUtils.copyProperties(chuanyunSelfWorkHourDO,chuanyunSelfWorkHourDTO);
-                        chuanyunSelfWorkHourDTO.setDepartmentId(departmentId);
+                        if (chuanyunUserCompanyDO!=null){
+                            chuanyunSelfWorkHourDTO.setDepartmentId(chuanyunUserCompanyDO.getDepartmentId());
+                        }
                         if (!StringUtils.isEmpty(chuanyunSelfWorkHourDO.getProjectId())&&!chuanyunSelfWorkHourDO.getProjectId().equals("production_project")){
                             List<String> matchers = new ArrayList<>();
                             matchers.add("F0000001_2,"+chuanyunSelfWorkHourDO.getProjectId());