From 0a9b6e565843bd25e5ef37e979c7da9bbf3df218 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 22 四月 2022 17:06:43 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-community/src/main/java/com/java110/community/api/RoomRenovationApi.java | 7 +++++++
1 files changed, 7 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 798ea13..c10923d 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
@@ -222,6 +222,7 @@
payFeePo.setState(FeeDto.STATE_DOING);
payFeePo.setConfigId(configId);
payFeePo.setPayerObjType(FeeDto.PAYER_OBJ_TYPE_ROOM);
+ payFeePo.setBatchId("-1");
payFeePos.add(payFeePo);
FeeAttrPo feeAttrPo1 = new FeeAttrPo();
feeAttrPo1.setFeeId(payFeePo.getFeeId());
@@ -541,6 +542,9 @@
@RequestParam(value = "personTel", required = false) String personTel,
@RequestParam(value = "state", required = false) String state,
@RequestParam(value = "isPostpone", required = false) String isPostpone,
+ @RequestParam(value = "renovationTime", required = false) String renovationTime,
+ @RequestParam(value = "renovationStartTime", required = false) String renovationStartTime,
+ @RequestParam(value = "renovationEndTime", required = false) String renovationEndTime,
@RequestHeader(value = "user-id") String userId,
@RequestParam(value = "page", required = false) int page,
@RequestParam(value = "row", required = false) int row) {
@@ -555,6 +559,9 @@
roomRenovationDto.setState(state);
roomRenovationDto.setUserId(userId);
roomRenovationDto.setIsPostpone(isPostpone);
+ roomRenovationDto.setRenovationTime(renovationTime);
+ roomRenovationDto.setRenovationStartTime(renovationStartTime);
+ roomRenovationDto.setRenovationEndTime(renovationEndTime);
return getRoomRenovationBMOImpl.get(roomRenovationDto);
}
--
Gitblit v1.8.0