|
|
@@ -136,6 +136,7 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
|
|
|
// 查询当前用户是否已有访客记录
|
|
|
LambdaQueryWrapper<WelcomeVisitor> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.eq(WelcomeVisitor::getStudentCard, visitorRequest.getStudentCard());
|
|
|
+ queryWrapper.ne(ObjectUtil.isNotNull(visitorRequest.getId()), WelcomeVisitor::getId, visitorRequest.getId());
|
|
|
if (this.count(queryWrapper) > 0) {
|
|
|
throw new MyCustomException(ResponseStatusEnum.EXISTS);
|
|
|
}
|
|
|
@@ -144,14 +145,13 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
|
|
|
|
|
|
// 校验车牌数量 4 固定写法
|
|
|
WelcomeSetting setting = settingService.getManageById("4");
|
|
|
- int carNum =0;
|
|
|
+ int carNum;
|
|
|
if(visitorRequest.getSchool().equals("墨轩湖校区")){
|
|
|
carNum = setting.getMxhCarNum();
|
|
|
}else{
|
|
|
carNum = setting.getHjhCarNum();
|
|
|
}
|
|
|
|
|
|
-
|
|
|
// 判断两天是否为同一天,如果为同一天,则比较当天的车辆数量
|
|
|
if (DateUtil.isSameDay(startTime, endTime)) {
|
|
|
checkCarNum(visitorRequest.getId(), startTime.toJdkDate(), carNum);
|