Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/iHotel_student_houtai into develop-wxl

src/main/java/com/template/api/HouseNumberStateAPI.java

@@ -22,7 +22,7 @@ public interface HouseNumberStateAPI {
 
     @GetMapping("/particular")
     @ApiOperation(value = "房态管理-房间详情", notes = "房态管理-房间详情", httpMethod = "GET")
-    CommonResult particular(String houseNumberId, String dateTime);
+    CommonResult particular(String houseNumberId, Integer houseNumberStateId);
 
     @GetMapping("/reserveDay")
     @ApiOperation(value = "房态管理-管理端预定未来8天占用状态", notes = "房态管理-管理端预定未来8天占用状态", httpMethod = "GET")

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -369,7 +369,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
 
     @Override
-    public CommonResult particular(String houseNumberId, String dateTime) {
+    public CommonResult particular(String houseNumberId, Integer houseNumberStateId) {
         if (ObjectUtils.isEmpty(houseNumberId)) {
             return CommonResult.fail("参数异常");
         }
@@ -385,11 +385,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         vo.setHouseType(house.getRoomType());
 
 //          状态 1.空闲 2.正在使用
-        LambdaQueryWrapper<HouseNumberState> wrapperHNS = new LambdaQueryWrapper<>();
-        wrapperHNS.eq(HouseNumberState::getHouseNumberId, houseNumberId)
-                .le(HouseNumberState::getStartTime, dateTime)
-                .ge(HouseNumberState::getEndTime, dateTime);
-        HouseNumberState houseNumberState = houseNumberStateService.getOne(wrapperHNS);
+//        LambdaQueryWrapper<HouseNumberState> wrapperHNS = new LambdaQueryWrapper<>();
+//        wrapperHNS.eq(HouseNumberState::getHouseNumberId, houseNumberId)
+//                .le(HouseNumberState::getStartTime, dateTime)
+//                .ge(HouseNumberState::getEndTime, dateTime);
+//        HouseNumberState houseNumberState = houseNumberStateService.getOne(wrapperHNS);
+        HouseNumberState houseNumberState = houseNumberStateService.getById(houseNumberStateId);
 
 
         if (ObjectUtils.isNotEmpty(houseNumberState)) {

src/main/java/com/template/model/vo/HouseStateVo.java

@@ -44,4 +44,5 @@ public class HouseStateVo {
     private String passWord;
     private Integer orderStatus;
     private Integer houseOrderId;
+    private Integer houseNumberStateId;
 }