|
@@ -299,14 +299,14 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
|
|
|
//判断时间是否一致 日期和时段
|
|
|
String visitDate = reservat.getVisitDate();
|
|
|
String visitTime = reservat.getVisitTime();
|
|
|
- if (! StringUtils.isNotBlank(visitDate) && visitDate.equals(DateUtils.getDate())){
|
|
|
+ if (StringUtils.isNotBlank(visitDate) && !visitDate.equals(DateUtils.getDate())){
|
|
|
return AjaxResult.error("来访日期有误,请查看预约日期。");
|
|
|
}
|
|
|
- if (! StringUtils.isNotBlank(visitTime)){
|
|
|
+ if (StringUtils.isNotBlank(visitTime)){
|
|
|
String[] s = visitTime.split("-");
|
|
|
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
|
|
|
try {
|
|
|
- if ((simpleDateFormat.parse(s[1]).getTime() < simpleDateFormat.parse(DateUtils.getTime()).getTime())) {
|
|
|
+ if (simpleDateFormat.parse(s[1]).getTime() < simpleDateFormat.parse(DateUtils.dateTimeNow("HH:mm:ss")).getTime()) {
|
|
|
return AjaxResult.error("来访时段有误,请查看预约时段。");
|
|
|
}
|
|
|
} catch (ParseException e) {
|