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