From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/api/ReportOwnerPayFeeApi.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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..5bdd074 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
@@ -1,14 +1,15 @@
package com.java110.report.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.reportOwnerPayFee.ReportOwnerPayFeeDto;
-import com.java110.po.reportOwnerPayFee.ReportOwnerPayFeePo;
+import com.java110.dto.reportFee.ReportOwnerPayFeeDto;
+import com.java110.po.reportFee.ReportOwnerPayFeePo;
import com.java110.report.bmo.reportOwnerPayFee.IDeleteReportOwnerPayFeeBMO;
import com.java110.report.bmo.reportOwnerPayFee.IGetReportOwnerPayFeeBMO;
import com.java110.report.bmo.reportOwnerPayFee.ISaveReportOwnerPayFeeBMO;
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,11 @@
*/
@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 = "feeTypeCd",required = false) String feeTypeCd,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportOwnerPayFeeDto reportOwnerPayFeeDto = new ReportOwnerPayFeeDto();
@@ -102,6 +107,19 @@
reportOwnerPayFeeDto.setRow(row);
reportOwnerPayFeeDto.setCommunityId(communityId);
reportOwnerPayFeeDto.setPfYear(pfYear);
+ reportOwnerPayFeeDto.setConfigId(configId);
+ reportOwnerPayFeeDto.setRoomName(roomName);
+ reportOwnerPayFeeDto.setOwnerName(ownerName);
+ reportOwnerPayFeeDto.setFeeTypeCd(feeTypeCd);
+ if (!StringUtil.isEmpty(roomName) && roomName.contains("-")) {
+ String[] datas = roomName.split("-",3);
+ 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