From 7935724516cb699835da888d59cd5b7bec5c6049 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 九月 2024 12:07:29 +0800
Subject: [PATCH] 完成业主功能的优化

---
 service-user/src/main/java/com/java110/user/api/RentingApi.java |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/service-user/src/main/java/com/java110/user/api/RentingApi.java b/service-user/src/main/java/com/java110/user/api/RentingApi.java
index 04289e8..9b194d7 100755
--- a/service-user/src/main/java/com/java110/user/api/RentingApi.java
+++ b/service-user/src/main/java/com/java110/user/api/RentingApi.java
@@ -4,13 +4,13 @@
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.utils.StringUtils;
 import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.rentingPool.RentingConfigDto;
-import com.java110.dto.rentingPool.RentingPoolDto;
-import com.java110.dto.rentingPool.RentingPoolAttrDto;
-import com.java110.po.rentingConfig.RentingConfigPo;
-import com.java110.po.rentingPool.RentingPoolPo;
-import com.java110.po.rentingPoolAttr.RentingPoolAttrPo;
-import com.java110.po.rentingPoolFlow.RentingPoolFlowPo;
+import com.java110.dto.renting.RentingConfigDto;
+import com.java110.dto.renting.RentingPoolDto;
+import com.java110.dto.renting.RentingPoolAttrDto;
+import com.java110.po.renting.RentingConfigPo;
+import com.java110.po.renting.RentingPoolPo;
+import com.java110.po.renting.RentingPoolAttrPo;
+import com.java110.po.renting.RentingPoolFlowPo;
 import com.java110.user.bmo.rentingConfig.IDeleteRentingConfigBMO;
 import com.java110.user.bmo.rentingConfig.IGetRentingConfigBMO;
 import com.java110.user.bmo.rentingConfig.ISaveRentingConfigBMO;
@@ -147,11 +147,15 @@
     public ResponseEntity<String> queryRentingConfig(
             @RequestParam(value = "page") int page,
             @RequestParam(value = "row") int row,
-            @RequestParam(value = "rentingConfigId", required = false) String rentingConfigId) {
+            @RequestParam(value = "rentingConfigId", required = false) String rentingConfigId,
+            @RequestParam(value = "rentingType",required = false) String rentingType,
+            @RequestParam(value = "rentingFormula",required = false) String rentingFormula) {
         RentingConfigDto rentingConfigDto = new RentingConfigDto();
         rentingConfigDto.setPage(page);
         rentingConfigDto.setRow(row);
         rentingConfigDto.setRentingConfigId(rentingConfigId);
+        rentingConfigDto.setRentingType(rentingType);
+        rentingConfigDto.setRentingFormula(rentingFormula);
         return getRentingConfigBMOImpl.get(rentingConfigDto);
     }
 

--
Gitblit v1.8.0