소스 검색

导入打卡日志判定BUG修复

anderx 1 년 전
부모
커밋
4c3c6f852b
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectStaffRecordServiceImpl.java

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/project/service/impl/ProjectStaffRecordServiceImpl.java

@@ -521,6 +521,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
                         if (StringUtils.isNull(projectTask)){
                         if (StringUtils.isNull(projectTask)){
                             throw new ServiceException(String.format("项目[%s]不存在",p.getProjectName()));
                             throw new ServiceException(String.format("项目[%s]不存在",p.getProjectName()));
                         }
                         }
+                        p.setPid(projectTask.getId());
                     }else {
                     }else {
                         throw new ServiceException(String.format("新增必须知道打卡项目编号"));
                         throw new ServiceException(String.format("新增必须知道打卡项目编号"));
                     }
                     }
@@ -530,7 +531,6 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
                     successMsg.append("<br/>" + successNum + "、项目: " + p.getProjectName() + " 导入成功");
                     successMsg.append("<br/>" + successNum + "、项目: " + p.getProjectName() + " 导入成功");
                 }else if (updateSupport){
                 }else if (updateSupport){
                     BeanValidators.validateWithException(validator, p);
                     BeanValidators.validateWithException(validator, p);
-
                     if (p.getDuration()!=projectStaffRecord.getDuration()){
                     if (p.getDuration()!=projectStaffRecord.getDuration()){
                         String recordTimes = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, p.getRecordTime());
                         String recordTimes = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, p.getRecordTime());
                         BigDecimal maxDuration= new BigDecimal(SecurityUtils.getLoginUser().getUser().getDept().getMaxDuration());
                         BigDecimal maxDuration= new BigDecimal(SecurityUtils.getLoginUser().getUser().getDept().getMaxDuration());