From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 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
index 7ea003d..5b36f10 100755
--- a/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
+++ b/service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java
@@ -285,6 +285,8 @@
String rId = roomRenovationPo.getrId();
//鐘舵��
String state = roomRenovationPo.getState();
+ //鏄惁杩濊
+ String isTrue = roomRenovationPo.getIsTrue();
//鏌ヨ褰撳墠鐢ㄦ埛淇℃伅
UserDto userDto = new UserDto();
userDto.setUserId(userId);
@@ -299,6 +301,7 @@
roomRenovationRecordPo.setCreateTime(format.format(new Date()));
roomRenovationRecordPo.setStaffId(userId);
roomRenovationRecordPo.setStaffName(users.get(0).getName());
+ roomRenovationRecordPo.setIsTrue(isTrue);
saveRoomRenovationRecordBMO.saveRecord(roomRenovationRecordPo);
FileRelPo fileRelPo = new FileRelPo();
fileRelPo.setFileRelId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_relId));
@@ -398,6 +401,7 @@
@RequestParam(value = "roomName", required = false) String roomName,
@RequestParam(value = "personName", required = false) String personName,
@RequestParam(value = "personTel", required = false) String personTel,
+ @RequestParam(value = "state", required = false) String state,
@RequestHeader(value = "user-id") String userId,
@RequestParam(value = "page", required = false) int page,
@RequestParam(value = "row", required = false) int row) {
@@ -409,6 +413,7 @@
roomRenovationDto.setRoomName(roomName);
roomRenovationDto.setPersonName(personName);
roomRenovationDto.setPersonTel(personTel);
+ roomRenovationDto.setState(state);
roomRenovationDto.setUserId(userId);
return getRoomRenovationBMOImpl.get(roomRenovationDto);
}
@@ -444,15 +449,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