From b5e47a74ad88c453bf82fb8b870b69ac9d45503f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 06 八月 2021 16:08:51 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/api/ReportOweFeeApi.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/api/ReportOweFeeApi.java b/service-report/src/main/java/com/java110/report/api/ReportOweFeeApi.java
index 0271ef9..3124fef 100644
--- a/service-report/src/main/java/com/java110/report/api/ReportOweFeeApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportOweFeeApi.java
@@ -9,6 +9,7 @@
import com.java110.report.bmo.reportOweFee.IUpdateReportOweFeeBMO;
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.*;
@@ -93,12 +94,45 @@
*/
@RequestMapping(value = "/queryReportOweFee", method = RequestMethod.GET)
public ResponseEntity<String> queryReportOweFee(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "configIds", required = false) String configIds,
+ @RequestParam(value = "payObjType", required = false) String payObjType,
+ @RequestParam(value = "num", required = false) String num,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
reportOweFeeDto.setPage(page);
reportOweFeeDto.setRow(row);
+ reportOweFeeDto.setPayerObjType(payObjType);
+ reportOweFeeDto.setPayerObjName(num);
reportOweFeeDto.setCommunityId(communityId);
+ if (!StringUtil.isEmpty(configIds)) {
+ String[] tmpConfigIds = configIds.split(",");
+ reportOweFeeDto.setConfigIds(tmpConfigIds);
+ }
return getReportOweFeeBMOImpl.get(reportOweFeeDto);
}
+
+ /**
+ * 鏌ヨ鎵�鏈夋瑺璐逛俊鎭�
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportOweFee/queryReportAllOweFee
+ * @path /app/reportOweFee/queryReportAllOweFee
+ */
+ @RequestMapping(value = "/queryReportAllOweFee", method = RequestMethod.GET)
+ public ResponseEntity<String> queryReportAllOweFee(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "configIds", required = false) String configIds,
+ @RequestParam(value = "payObjType", required = false) String payObjType,
+ @RequestParam(value = "num", required = false) String num) {
+ ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
+ reportOweFeeDto.setPayerObjType(payObjType);
+ reportOweFeeDto.setPayerObjName(num);
+ reportOweFeeDto.setCommunityId(communityId);
+ if (!StringUtil.isEmpty(configIds)) {
+ String[] tmpConfigIds = configIds.split(",");
+ reportOweFeeDto.setConfigIds(tmpConfigIds);
+ }
+ return getReportOweFeeBMOImpl.getAllFees(reportOweFeeDto);
+ }
}
--
Gitblit v1.8.0