Jelajahi Sumber

1.修改每日工时BG归属

WoNiu 3 tahun lalu
induk
melakukan
d64b00ce02

+ 5 - 3
src/main/java/com/galaxis/manatee/service/LogStandardService.java

@@ -242,14 +242,16 @@ public class LogStandardService {
             } else {
                 BigDecimal personDays = (chuanyunWorkHourDO.getHoursWorked().divide(oneDayTotalHour.getHoursWorked(), 2, RoundingMode.HALF_UP)).multiply(standard);
                 chuanyunSelfWorkHourDO.setStandardWorkHour(personDays);
-            }
+             }
         }else{
             throw new Exception("获取每日总工时失败");
         }
         //获取人员所属BG
         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 {
             chuanyunSelfWorkHourDO.setBg(chuanyunWorkHourDO.getBgName());
         }