|
|
@@ -266,7 +266,9 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
|
|
|
@Override
|
|
|
public AjaxResult recordDetails(Long id) {
|
|
|
- return AjaxResult.success(projectStaffRecordMapper.selectDetailsById(id));
|
|
|
+ ProjectStaffRecordOut out = projectStaffRecordMapper.selectDetailsById(id);
|
|
|
+ out.setCreateTime(out.getRecordTime());
|
|
|
+ return AjaxResult.success(out);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -640,9 +642,17 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
Long companyId = deptService.selectCompanyByDeptId();
|
|
|
if (companyId!=null)in.setCompanyId(companyId);
|
|
|
if (in.getEndTime()!=null)in.setEndTime(in.getEndTime()+" 23:59:59");
|
|
|
- return projectStaffRecordMapper.selectList(in);
|
|
|
+ List<ProjectStaffRecordOut> outs = projectStaffRecordMapper.selectList(in);
|
|
|
+ for (ProjectStaffRecordOut out : outs) {
|
|
|
+ out.setCreateTime(out.getRecordTime());
|
|
|
+ }
|
|
|
+ return outs;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
public String importProject(List<ProjectStaffRecordOut> list, boolean updateSupport) {
|
|
|
if (StringUtils.isNull(list) || list.size() == 0)
|