From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java b/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
old mode 100644
new mode 100755
index 79c207d..f8e08be
--- a/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
+++ b/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
@@ -42,7 +42,6 @@
import java.util.Date;
import java.util.List;
-
@RestController
@RequestMapping(value = "/roomRenovation")
public class RoomRenovationApi {
@@ -445,15 +444,19 @@
roomDto.setRoomId(reqJson.getString("roomId"));
//鐘舵�佸彉涓哄凡瑁呬慨
roomDto.setState("2005");
+ //楠屾敹鎴愬姛
+ roomRenovationDetailPo.setState("3000");
saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
return updateRoomRenovationBMOImpl.updateRoom(roomDto);
- } else if (roomRenovationDetailPo.getState().equals("6000")) {
- RoomDto roomDto = new RoomDto();
- roomDto.setRoomId(reqJson.getString("roomId"));
- //鐘舵�佸彉涓哄凡浜ゆ埧
- roomDto.setState("2003");
- saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
- return updateRoomRenovationBMOImpl.updateRoom(roomDto);
+ } else if (roomRenovationDetailPo.getState().equals("6000")) { //楠屾敹澶辫触瑁呬慨鐘舵�佸彉涓鸿淇腑
+ RoomRenovationPo roomRenovation = new RoomRenovationPo();
+ roomRenovation.setrId(roomRenovationDetailPo.getrId());
+ roomRenovation.setState("3000");
+ //楠屾敹澶辫触鎶婃埧灞嬬姸鎬佸彉涓鸿淇腑锛岃涓氫富瑁呬慨鏁存敼
+ updateRoomRenovationBMOImpl.update(roomRenovation);
+ //楠屾敹澶辫触
+ roomRenovationDetailPo.setState("4000");
+ return saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
} else {
return saveRoomRenovationDetailBMOImpl.save(roomRenovationDetailPo);
}
--
Gitblit v1.8.0