|
|
@@ -277,8 +277,10 @@ public class ProjectStaffRecordServiceImpl implements ProjectStaffRecordService
|
|
|
long endTime = DateUtils.getNowDate().getTime();
|
|
|
long startTime = projectTask.getStartTime().getTime();
|
|
|
if (endTime>projectTask.getEndTime().getTime())endTime=projectTask.getEndTime().getTime();
|
|
|
- if (in.getRecordTime().getTime()>endTime||in.getRecordTime().getTime()<startTime){
|
|
|
- ajaxResult=AjaxResult.error("不在研发时间内,不可打卡");
|
|
|
+ if (in.getRecordTime().getTime()<startTime){
|
|
|
+ ajaxResult=AjaxResult.error(String.format("项目研发时间未开始[%s],不可打卡",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,projectTask.getStartTime())));
|
|
|
+ }else if (in.getRecordTime().getTime()>endTime){
|
|
|
+ ajaxResult=AjaxResult.error(String.format("项目研发时间已结束[%s],不可打卡",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,projectTask.getEndTime())));
|
|
|
}
|
|
|
}
|
|
|
return ajaxResult;
|