|
@@ -242,14 +242,16 @@ public class LogStandardService {
|
|
} else {
|
|
} else {
|
|
BigDecimal personDays = (chuanyunWorkHourDO.getHoursWorked().divide(oneDayTotalHour.getHoursWorked(), 2, RoundingMode.HALF_UP)).multiply(standard);
|
|
BigDecimal personDays = (chuanyunWorkHourDO.getHoursWorked().divide(oneDayTotalHour.getHoursWorked(), 2, RoundingMode.HALF_UP)).multiply(standard);
|
|
chuanyunSelfWorkHourDO.setStandardWorkHour(personDays);
|
|
chuanyunSelfWorkHourDO.setStandardWorkHour(personDays);
|
|
- }
|
|
|
|
|
|
+ }
|
|
}else{
|
|
}else{
|
|
throw new Exception("获取每日总工时失败");
|
|
throw new Exception("获取每日总工时失败");
|
|
}
|
|
}
|
|
//获取人员所属BG
|
|
//获取人员所属BG
|
|
if (StringUtils.isEmpty(chuanyunWorkHourDO.getBgName())){
|
|
if (StringUtils.isEmpty(chuanyunWorkHourDO.getBgName())){
|
|
- ChuanyunUserCompanyDO chuanyunUserCompanyDO = chuanyunUserCompanyDao.findByUserId(chuanyunSelfWorkHourDO.getUserId());
|
|
|
|
- chuanyunSelfWorkHourDO.setBg(chuanyunUserCompanyDO.getBg());
|
|
|
|
|
|
+ List<ChuanyunSelfWorkHourDO> list = chuanyunSelfWorkHourDao.findByUserIdAndProjectIdAndDayLogDateAndProjectType(chuanyunWorkHourDO.getUserId(),chuanyunWorkHourDO.getProjectId(),chuanyunWorkHourDO.getDayLogDate(),chuanyunWorkHourDO.getProjectType());
|
|
|
|
+ if (list.size()>0&&list!=null){
|
|
|
|
+ chuanyunSelfWorkHourDO.setBg(list.get(0).getBg());
|
|
|
|
+ }
|
|
}else {
|
|
}else {
|
|
chuanyunSelfWorkHourDO.setBg(chuanyunWorkHourDO.getBgName());
|
|
chuanyunSelfWorkHourDO.setBg(chuanyunWorkHourDO.getBgName());
|
|
}
|
|
}
|