|
@@ -650,19 +650,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
}else {
|
|
}else {
|
|
|
throw new ServiceException(String.format("新增必须知道打卡人"));
|
|
throw new ServiceException(String.format("新增必须知道打卡人"));
|
|
|
}
|
|
}
|
|
|
- if (StringUtils.isNotBlank(p.getProjectNumber())){
|
|
|
|
|
- ProjectTask projectTask = projectTaskMapper.selectByProjectNumber(p.getProjectNumber(),companyId);
|
|
|
|
|
-
|
|
|
|
|
- if (StringUtils.isNull(projectTask)){
|
|
|
|
|
- throw new ServiceException(String.format("项目[%s]不存在",p.getProjectName()));
|
|
|
|
|
- }
|
|
|
|
|
- p.setPid(projectTask.getId());
|
|
|
|
|
- if (!pids.contains(p.getPid())){
|
|
|
|
|
- pids.add(p.getPid());
|
|
|
|
|
- }
|
|
|
|
|
- }else {
|
|
|
|
|
- throw new ServiceException(String.format("新增必须知道打卡项目编号"));
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ pushProjectId(companyId, pids, p);
|
|
|
p.setProcessStatus(2);
|
|
p.setProcessStatus(2);
|
|
|
projectStaffRecordMapper.insertSelective(p);
|
|
projectStaffRecordMapper.insertSelective(p);
|
|
|
successNum++;
|
|
successNum++;
|
|
@@ -681,6 +669,7 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
projectTaskMapper.updateDuration(projectStaffRecord.getPid());
|
|
projectTaskMapper.updateDuration(projectStaffRecord.getPid());
|
|
|
sysUserMapper.updateDuration(projectStaffRecord.getAid());
|
|
sysUserMapper.updateDuration(projectStaffRecord.getAid());
|
|
|
}
|
|
}
|
|
|
|
|
+ pushProjectId(companyId, pids, p);
|
|
|
projectStaffRecordMapper.updateByPrimaryKeySelective(p);
|
|
projectStaffRecordMapper.updateByPrimaryKeySelective(p);
|
|
|
successNum++;
|
|
successNum++;
|
|
|
successMsg.append("<br/>" + successNum + "、项目: " + p.getProjectName() + " 更新成功");
|
|
successMsg.append("<br/>" + successNum + "、项目: " + p.getProjectName() + " 更新成功");
|
|
@@ -721,6 +710,22 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
return successMsg.toString();
|
|
return successMsg.toString();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ private void pushProjectId(Long companyId, List<Long> pids, ProjectStaffRecordOut p) {
|
|
|
|
|
+ if (StringUtils.isNotBlank(p.getProjectNumber())){
|
|
|
|
|
+ ProjectTask projectTask = projectTaskMapper.selectByProjectNumber(p.getProjectNumber(),companyId);
|
|
|
|
|
+
|
|
|
|
|
+ if (StringUtils.isNull(projectTask)){
|
|
|
|
|
+ throw new ServiceException(String.format("项目[%s]不存在",p.getProjectName()));
|
|
|
|
|
+ }
|
|
|
|
|
+ p.setPid(projectTask.getId());
|
|
|
|
|
+ if (!pids.contains(p.getPid())){
|
|
|
|
|
+ pids.add(p.getPid());
|
|
|
|
|
+ }
|
|
|
|
|
+ }else {
|
|
|
|
|
+ throw new ServiceException(String.format("新增必须知道打卡项目编号"));
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public AjaxResult myDuration(Long id,String recordTime) {
|
|
public AjaxResult myDuration(Long id,String recordTime) {
|
|
|
String maxDurationProjectFlag = configService.selectConfigByKey("maxDurationProject");
|
|
String maxDurationProjectFlag = configService.selectConfigByKey("maxDurationProject");
|