夏文涛 1 anno fa
parent
commit
f7c4faa30a

+ 1 - 1
src/main/java/com/template/api/WelcomeBedControllerAPI.java

@@ -63,6 +63,6 @@ public interface WelcomeBedControllerAPI {
 
     @GetMapping(value = "/isCheck")
     @ApiOperation(value = "判断是否入住", notes = "判断是否入住", httpMethod = "GET")
-    CommonResult isCheck(@RequestParam String studentCard);
+    CommonResult isCheck(@RequestAttribute String studentCard);
 
 }

+ 3 - 0
src/main/java/com/template/services/impl/WelcomeVisitorServiceImpl.java

@@ -66,6 +66,7 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
         BeanUtils.copyProperties(visitorRequest, visitor);
         visitor.setStudentCard(studentCard);
         visitor.setRemark("用户新增");
+        visitor.setDeleted(0);
 
         save(visitor);
 
@@ -142,6 +143,7 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
         // 新增访客记录
         WelcomeVisitor newVisitor = new WelcomeVisitor();
         BeanUtils.copyProperties(visitorRequest, newVisitor);
+        newVisitor.setDeleted(0);
         updateById(newVisitor);
 
         // 更新车辆信息
@@ -153,6 +155,7 @@ public class WelcomeVisitorServiceImpl extends ServiceImpl<WelcomeVisitorMapper,
         LambdaQueryWrapper<WelcomeVisitor> wrapper = new LambdaQueryWrapper<>();
         wrapper.like(StrUtil.isNotBlank(visitorQuery.getCarNumber()), WelcomeVisitor::getCarNumber, visitorQuery.getCarNumber());
         wrapper.like(StrUtil.isNotBlank(visitorQuery.getName()), WelcomeVisitor::getName, visitorQuery.getName());
+        wrapper.eq(WelcomeVisitor::getDeleted,0);
 
         IPage<WelcomeVisitor> page = baseMapper.selectPage(new IPageUtil<WelcomeVisitor>().getPage(visitorQuery), wrapper);