From 2703710ab562eca0b94fbfda76a196cc30e64483 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 18 四月 2023 00:06:07 +0800
Subject: [PATCH] 优化 导入费用时，模板上能体现一下房屋状态，这样未销售房就不会依然被填入
---
service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java b/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
index 403c34c..3568ed2 100755
--- a/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
@@ -128,6 +128,10 @@
@RequestParam(value = "payObjId", required = false) String payObjId,
@RequestParam(value = "receiptId", required = false) String receiptId,
@RequestParam(value = "receiptIds", required = false) String receiptIds,
+ @RequestParam(value = "detailIds", required = false) String detailIds,
+ @RequestParam(value = "qstartTime", required = false) String qstartTime,
+ @RequestParam(value = "qendTime", required = false) String qendTime,
+ @RequestParam(value = "feeId", required = false) String feeId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row,
@RequestHeader(value = "user_id") String userId) {
@@ -147,11 +151,21 @@
if (!StringUtil.isEmpty(receiptIds)) {
feeReceiptDto.setReceiptIds(receiptIds.split(","));
}
+ if (!StringUtil.isEmpty(detailIds)) {
+ feeReceiptDto.setDetailIds(detailIds.split(","));
+ }
feeReceiptDto.setObjType(objType);
feeReceiptDto.setObjName(roomId);
feeReceiptDto.setObjId(objId);
feeReceiptDto.setStoreName(storeName);
feeReceiptDto.setPayObjId(payObjId);
+ feeReceiptDto.setFeeId(feeId);
+ if (!StringUtil.isEmpty(qstartTime)) {
+ feeReceiptDto.setQstartTime(qstartTime + " 00:00:00");
+ }
+ if (!StringUtil.isEmpty(qendTime)) {
+ feeReceiptDto.setQendTime(qendTime + " 23:59:59");
+ }
return getFeeReceiptBMOImpl.get(feeReceiptDto);
}
@@ -161,8 +175,8 @@
*
* @param communityId 灏忓尯ID
* @return
- * @serviceCode /feeReceipt/queryFeeReceipt
- * @path /app/feeReceipt/queryFeeReceipt
+ * @serviceCode /feeReceipt/queryFeeReceiptNew
+ * @path /app/feeReceipt/queryFeeReceiptNew
*/
@RequestMapping(value = "/queryFeeReceiptNew", method = RequestMethod.GET)
public ResponseEntity<String> queryFeeReceiptNew(@RequestParam(value = "communityId") String communityId,
@@ -257,6 +271,7 @@
public ResponseEntity<String> queryFeeReceiptDetail(@RequestParam(value = "communityId") String communityId,
@RequestParam(value = "receiptId", required = false) String receiptId,
@RequestParam(value = "receiptIds", required = false) String receiptIds,
+ @RequestParam(value = "detailIds", required = false) String detailIds,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
@@ -267,6 +282,9 @@
if (!StringUtil.isEmpty(receiptIds)) {
feeReceiptDetailDto.setReceiptIds(receiptIds.split(","));
}
+ if (!StringUtil.isEmpty(detailIds)) {
+ feeReceiptDetailDto.setDetailIds(detailIds.split(","));
+ }
return getFeeReceiptDetailBMOImpl.get(feeReceiptDetailDto);
}
--
Gitblit v1.8.0