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 | 5 +++++
1 files changed, 5 insertions(+), 0 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 f8e08be..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);
}
--
Gitblit v1.8.0