From c0058c75052eb74fd4b8c40b243db231c1a6b08a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 23 七月 2021 10:10:11 +0800
Subject: [PATCH] 加入催缴单功能

---
 service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java |   14 ++++++++++++--
 1 files changed, 12 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 cfb9d07..257344b 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
@@ -125,8 +125,11 @@
                                                   @RequestParam(value = "objType", required = false) String objType,
                                                   @RequestParam(value = "objId", required = false) String objId,
                                                   @RequestParam(value = "roomId", required = false) String roomId,
+                                                  @RequestParam(value = "payObjId", required = false) String payObjId,
                                                   @RequestParam(value = "receiptId", required = false) String receiptId,
                                                   @RequestParam(value = "receiptIds", required = false) String receiptIds,
+                                                  @RequestParam(value = "qstartTime", required = false) String qstartTime,
+                                                  @RequestParam(value = "qendTime", required = false) String qendTime,
                                                   @RequestParam(value = "page") int page,
                                                   @RequestParam(value = "row") int row,
                                                   @RequestHeader(value = "user_id") String userId) {
@@ -150,6 +153,13 @@
         feeReceiptDto.setObjName(roomId);
         feeReceiptDto.setObjId(objId);
         feeReceiptDto.setStoreName(storeName);
+        feeReceiptDto.setPayObjId(payObjId);
+        if (!StringUtil.isEmpty(qstartTime)) {
+            feeReceiptDto.setQstartTime(qstartTime + " 00:00:00");
+        }
+        if (!StringUtil.isEmpty(qendTime)) {
+            feeReceiptDto.setQendTime(qendTime + " 23:59:59");
+        }
         return getFeeReceiptBMOImpl.get(feeReceiptDto);
     }
 
@@ -159,8 +169,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,

--
Gitblit v1.8.0