From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeObjCmd.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeObjCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeObjCmd.java
index 9d92a05..836e07c 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeObjCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/ListFeeObjCmd.java
@@ -18,6 +18,7 @@
 
     @Autowired
     private IQueryOweFee queryOweFeeImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
         Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖轰俊鎭�");
@@ -35,7 +36,13 @@
         if (reqJson.containsKey("custEndTime") && !StringUtil.isEmpty(reqJson.getString("custEndTime"))) {
             feeDto.setCustEndTime(reqJson.getString("custEndTime"));
         }
-        ResponseEntity<String> result =  queryOweFeeImpl.listFeeObj(feeDto);
+
+        if("105".equals(reqJson.getString("cycle"))){
+            feeDto.setCustomStartTime(reqJson.getString("customStartTime"));
+            feeDto.setCustomEndTime(reqJson.getString("customEndTime"));
+        }
+
+        ResponseEntity<String> result = queryOweFeeImpl.listFeeObj(feeDto);
         context.setResponseEntity(result);
     }
 }

--
Gitblit v1.8.0