From e46395d507a9eb1d4534c61184b4d60dbd75f888 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 18 五月 2023 18:28:27 +0800
Subject: [PATCH] optimize

---
 service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java b/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
old mode 100644
new mode 100755
index 8d21831..d9c625b
--- a/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
@@ -2,7 +2,7 @@
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.dto.importFee.ImportFeeDto;
-import com.java110.dto.importFeeDetail.ImportFeeDetailDto;
+import com.java110.dto.importFee.ImportFeeDetailDto;
 import com.java110.fee.bmo.importFee.IFeeSharingBMO;
 import com.java110.fee.bmo.importFee.IGetImportFeeBMO;
 import com.java110.fee.bmo.importFeeDetail.IDeleteImportFeeDetailBMO;
@@ -108,7 +108,8 @@
                                                        @RequestParam(value = "floorNum", required = false) String floorNum,
                                                        @RequestParam(value = "unitNum", required = false) String unitNum,
                                                        @RequestParam(value = "roomNum", required = false) String roomNum,
-                                                       @RequestParam(value = "importFeeId") String importFeeId) {
+                                                       @RequestParam(value = "feeId", required = false) String feeId,
+                                                       @RequestParam(value = "importFeeId", required = false) String importFeeId) {
         ImportFeeDetailDto importFeeDetailDto = new ImportFeeDetailDto();
         importFeeDetailDto.setPage(page);
         importFeeDetailDto.setRow(row);
@@ -117,6 +118,7 @@
         importFeeDetailDto.setFloorNum(floorNum);
         importFeeDetailDto.setUnitNum(unitNum);
         importFeeDetailDto.setRoomNum(roomNum);
+        importFeeDetailDto.setFeeId(feeId);
         return getImportFeeDetailBMOImpl.get(importFeeDetailDto);
     }
 
@@ -167,8 +169,9 @@
         Assert.hasKeyAndValue(reqObj, "endTime", "鏈寘鍚粨鏉熸椂闂�");
         Assert.hasKeyAndValue(reqObj, "objId", "鏈寘鍚叕鎽婂璞�");
         Assert.hasKeyAndValue(reqObj, "feeTypeCd", "鏈寘鍚垂鐢ㄧ被鍨�");
-        reqObj.put("storeId",storeId);
-        reqObj.put("userId",userId);
+        Assert.hasKeyAndValue(reqObj, "roomType", "鏈寘鍚埧灞嬬被鍨�");
+        reqObj.put("storeId", storeId);
+        reqObj.put("userId", userId);
 
         return feeSharingBMOImpl.share(reqObj);
     }

--
Gitblit v1.8.0