From 4ee86eb0f4984bf3ede3196ad8c5fe95e8c5a504 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 15 六月 2022 19:05:02 +0800
Subject: [PATCH] 优化代码
---
service-report/src/main/java/com/java110/report/api/ReportOwnerPayFeeApi.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/api/ReportOwnerPayFeeApi.java b/service-report/src/main/java/com/java110/report/api/ReportOwnerPayFeeApi.java
index 6cacc2c..a8ce6f1 100644
--- a/service-report/src/main/java/com/java110/report/api/ReportOwnerPayFeeApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportOwnerPayFeeApi.java
@@ -9,6 +9,7 @@
import com.java110.report.bmo.reportOwnerPayFee.IUpdateReportOwnerPayFeeBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -94,7 +95,10 @@
*/
@RequestMapping(value = "/queryReportOwnerPayFee", method = RequestMethod.GET)
public ResponseEntity<String> queryReportOwnerPayFee(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "pfYear",required = false) String pfYear,
+ @RequestParam(value = "pfYear", required = false) String pfYear,
+ @RequestParam(value = "configId", required = false) String configId,
+ @RequestParam(value = "roomName", required = false) String roomName,
+ @RequestParam(value = "ownerName", required = false) String ownerName,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportOwnerPayFeeDto reportOwnerPayFeeDto = new ReportOwnerPayFeeDto();
@@ -102,6 +106,18 @@
reportOwnerPayFeeDto.setRow(row);
reportOwnerPayFeeDto.setCommunityId(communityId);
reportOwnerPayFeeDto.setPfYear(pfYear);
+ reportOwnerPayFeeDto.setConfigId(configId);
+ reportOwnerPayFeeDto.setRoomName(roomName);
+ reportOwnerPayFeeDto.setOwnerName(ownerName);
+ if (!StringUtil.isEmpty(roomName) && roomName.contains("-")) {
+ String[] datas = roomName.split("-");
+ if (datas.length != 3) {
+ throw new IllegalArgumentException("鎴垮眿鏍煎紡閿欒锛岃濉啓 妤兼爧-鍗曞厓-鎴垮眿鏍煎紡");
+ }
+ reportOwnerPayFeeDto.setFloorNum(datas[0]);
+ reportOwnerPayFeeDto.setUnitNum(datas[1]);
+ reportOwnerPayFeeDto.setRoomNum(datas[2]);
+ }
return getReportOwnerPayFeeBMOImpl.get(reportOwnerPayFeeDto);
}
}
--
Gitblit v1.8.0