Browse Source

1.更新日工时统计

WoNiu 4 years ago
parent
commit
43f718e4c2

+ 5 - 0
src/main/java/com/galaxis/manatee/task/WorkHourStatisticsRecently.java

@@ -235,6 +235,11 @@ public class WorkHourStatisticsRecently {
                         WorkHourStatistics.ChuanyunSelfWorkHourDTO chuanyunSelfWorkHourDTO = new WorkHourStatistics.ChuanyunSelfWorkHourDTO();
                         BeanUtils.copyProperties(chuanyunSelfWorkHourDO,chuanyunSelfWorkHourDTO);
                         if (chuanyunUserCompanyDO!=null){
+                            chuanyunSelfWorkHourDTO.setUserName(chuanyunUserCompanyDO.getUserName());
+                        }else{
+                            chuanyunSelfWorkHourDTO.setUserName(chuanyunSelfWorkHourDTO.getUserId());
+                        }
+                        if (chuanyunUserCompanyDO!=null){
                             chuanyunSelfWorkHourDTO.setDepartmentId(chuanyunUserCompanyDO.getDepartmentId());
                         }
                         if (!StringUtils.isEmpty(chuanyunSelfWorkHourDO.getProjectId())&&!chuanyunSelfWorkHourDO.getProjectId().equals("production_project")){