From 1d4e7dc07b0ef56d852a02ffc6f02df0d28d4549 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 23 八月 2021 16:58:31 +0800
Subject: [PATCH] 优化代码

---
 service-fee/src/main/java/com/java110/fee/api/FeeApi.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/api/FeeApi.java b/service-fee/src/main/java/com/java110/fee/api/FeeApi.java
index 33b5b15..953e486 100755
--- a/service-fee/src/main/java/com/java110/fee/api/FeeApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeApi.java
@@ -12,6 +12,7 @@
 import com.java110.utils.exception.InitConfigDataException;
 import com.java110.utils.exception.InitDataFlowContextException;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -180,17 +181,18 @@
         feeDto.setCommunityId(communityId);
         return queryOweFeeImpl.query(feeDto);
     }
+
     /**
      * 鏌ヨ娆犺垂璐圭敤
      *
-     * @param roomId    鎴垮眿ID
+     * @param roomId      鎴垮眿ID
      * @param communityId 灏忓尯ID
      * @return
      * @path /app/feeApi/listAllRoomOweFees
      */
     @RequestMapping(value = "/listAllRoomOweFees", method = RequestMethod.GET)
     public ResponseEntity<String> listAllRoomOweFees(
-            @RequestParam(value = "roomId",required = false) String roomId,
+            @RequestParam(value = "roomId", required = false) String roomId,
             @RequestParam(value = "communityId") String communityId) {
         FeeDto feeDto = new FeeDto();
         feeDto.setPayerObjId(roomId);
@@ -204,16 +206,21 @@
      *
      * @param feeId       璐圭敤ID
      * @param communityId 灏忓尯ID
+     * @param cycle       鍛ㄦ湡
      * @return
      * @path /app/feeApi/listFeeObj
      */
     @RequestMapping(value = "/listFeeObj", method = RequestMethod.GET)
     public ResponseEntity<String> listFeeObj(
             @RequestParam(value = "feeId") String feeId,
+            @RequestParam(value = "cycle", required = false) String cycle,
             @RequestParam(value = "communityId") String communityId) {
         FeeDto feeDto = new FeeDto();
         feeDto.setFeeId(feeId);
         feeDto.setCommunityId(communityId);
+        if (!StringUtil.isEmpty(cycle)) {
+            feeDto.setCycle(cycle);
+        }
         return queryOweFeeImpl.listFeeObj(feeDto);
     }
 
@@ -293,6 +300,7 @@
      * 杞﹁締璐圭敤瀵煎叆
      * /feeApi/importCarFees
      * path /app/feeApi/importCarFees
+     *
      * @param reqString
      * @return
      */
@@ -312,6 +320,7 @@
      * 鍚堝悓璐圭敤瀵煎叆
      * /feeApi/importContractFees
      * path /app/feeApi/importContractFees
+     *
      * @param reqString
      * @return
      */

--
Gitblit v1.8.0