|
@@ -1435,13 +1435,15 @@ public class ApsReportRecordsServiceImpl extends ServiceImpl<ApsReportRecordsDao
|
|
|
//•如果报工记录的报工时间<=开工时间,则错误提示:报工时间必须大于开工时间
|
|
|
Date startworktime = req.getStartworktime();
|
|
|
Date reportworktime = req.getReportworktime();
|
|
|
+ Date now = DateUtil.date();
|
|
|
if (ObjectUtil.isEmpty(startworktime)) {
|
|
|
return R.error("开工时间不能为空");
|
|
|
}
|
|
|
if (ObjectUtil.isEmpty(reportworktime)) {
|
|
|
return R.error("报工时间不能为空");
|
|
|
}
|
|
|
- if (reportworktime.after(DateUtil.date())) {
|
|
|
+ if (reportworktime.compareTo(now) > 0) {
|
|
|
+ log.error("报工时间:{},当前时间:{}", reportworktime, now);
|
|
|
return R.error("报工时间不应该大于当前时间");
|
|
|
}
|
|
|
if (reportworktime.compareTo(startworktime) <= 0) {
|