Browse Source

修改未来8天占用情况接口

liu 1 year ago
parent
commit
814586daa9

+ 11 - 6
src/main/java/com/template/controller/HouseNumberStateController.java

@@ -526,8 +526,15 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         LocalDateTime end = LocalDateTime.parse(endTime, dateTimeFormatter1);
         LocalDateTime end = LocalDateTime.parse(endTime, dateTimeFormatter1);
         ArrayList<ReserveDayVo> reserveDayVos = new ArrayList<>();
         ArrayList<ReserveDayVo> reserveDayVos = new ArrayList<>();
         for (int i = 0; i <= 8; i++) {
         for (int i = 0; i <= 8; i++) {
+            LocalDateTime localDateTime=null;
+            if (i==0) {
+                localDateTime=LocalDateTime.now();
+            }else {
+                localDateTime = start.plusDays(i);
+            }
+
             ReserveDayVo reserveDayVo = new ReserveDayVo();
             ReserveDayVo reserveDayVo = new ReserveDayVo();
-            LocalDateTime localDateTime = start.plusDays(i);
+//            LocalDateTime localDateTime = start.plusDays(i);
             LocalDateTime localDateTime2 = end.plusDays(i);
             LocalDateTime localDateTime2 = end.plusDays(i);
             String format = localDateTime.format(dateTimeFormatter1);
             String format = localDateTime.format(dateTimeFormatter1);
             String format2 = localDateTime2.format(dateTimeFormatter1);
             String format2 = localDateTime2.format(dateTimeFormatter1);
@@ -1691,7 +1698,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         if (ObjectUtils.isEmpty(list) || list.size() <= 0) {
         if (ObjectUtils.isEmpty(list) || list.size() <= 0) {
             return CommonResult.fail("无锁定房间");
             return CommonResult.fail("无锁定房间");
         }
         }
-        houseNumberStateService.removeByIds(list);
+        houseNumberStateService.updateBatchById(list);
 
 
 
 
         return CommonResult.ok();
         return CommonResult.ok();
@@ -1929,10 +1936,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         if (ObjectUtils.isEmpty(houseNumberState)) {
         if (ObjectUtils.isEmpty(houseNumberState)) {
             return CommonResult.fail("无维修房间");
             return CommonResult.fail("无维修房间");
         }
         }
-//        houseNumberState.setEndTime(format);
-//        houseNumberStateService.updateById(houseNumberState);
-        houseNumberStateService.removeById(houseNumberState);
-
+        houseNumberState.setEndTime(format);
+        houseNumberStateService.updateById(houseNumberState);
 
 
         houseNumber.setHouseStatus(1);
         houseNumber.setHouseStatus(1);
 //        关电
 //        关电

+ 1 - 1
src/main/java/com/template/controller/HouseOrderController.java

@@ -611,7 +611,7 @@ public class HouseOrderController implements HouseOrderAPI {
             houseNumberState.setEndTime(sdf.format(new Date()));
             houseNumberState.setEndTime(sdf.format(new Date()));
 
 
             houseOrderService.updateById(houseOrder);
             houseOrderService.updateById(houseOrder);
-            houseNumberStateService.removeById(houseNumberState);
+            houseNumberStateService.updateById(houseNumberState);
             return CommonResult.ok();
             return CommonResult.ok();
 
 
         } catch (Exception e) {
         } catch (Exception e) {