From d3e23e26fcfc17e770fca7c29b290ef5082e5734 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 04 七月 2023 22:32:00 +0800
Subject: [PATCH] 优化1.5报表相关bug
---
service-report/src/main/java/com/java110/report/api/ReportOweFeeApi.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 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 be6c5e9..a48a836 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
@@ -1,8 +1,8 @@
package com.java110.report.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.reportOweFee.ReportOweFeeDto;
-import com.java110.po.reportOweFee.ReportOweFeePo;
+import com.java110.dto.reportFee.ReportOweFeeDto;
+import com.java110.po.reportFee.ReportOweFeePo;
import com.java110.report.bmo.reportOweFee.IDeleteReportOweFeeBMO;
import com.java110.report.bmo.reportOweFee.IGetReportOweFeeBMO;
import com.java110.report.bmo.reportOweFee.ISaveReportOweFeeBMO;
@@ -94,17 +94,71 @@
*/
@RequestMapping(value = "/queryReportOweFee", method = RequestMethod.GET)
public ResponseEntity<String> queryReportOweFee(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "configIds") String configIds,
+ @RequestParam(value = "configIds", required = false) String configIds,
+ @RequestParam(value = "payObjType", required = false) String payObjType,
+ @RequestParam(value = "num", required = false) String num,
+ @RequestParam(value = "ownerName", required = false) String ownerName,
+ @RequestParam(value = "floorId", required = false) String floorId,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "roomSubType", required = false) String roomSubType,
+ @RequestParam(value = "roomNum", required = false) String roomNum,
+ @RequestParam(value = "ownerId", required = false) String ownerId,
+ @RequestParam(value = "payerObjId", required = false) String payerObjId,
@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);
+ reportOweFeeDto.setOwnerName(ownerName);
+ reportOweFeeDto.setFloorId(floorId);
+ reportOweFeeDto.setUnitId(unitId);
+ reportOweFeeDto.setRoomSubType(roomSubType);
+ reportOweFeeDto.setRoomNum(roomNum);
+ reportOweFeeDto.setOwnerId(ownerId);
+ reportOweFeeDto.setPayerObjId(payerObjId);
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 = "hasOweFee", required = false) String hasOweFee,
+ @RequestParam(value = "ownerName", required = false) String ownerName,
+ @RequestParam(value = "floorId", required = false) String floorId,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "roomSubType", required = false) String roomSubType,
+ @RequestParam(value = "roomNum", required = false) String roomNum,
+ @RequestParam(value = "num", required = false) String num) {
+ ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
+ reportOweFeeDto.setPayerObjType(payObjType);
+ reportOweFeeDto.setPayerObjName(num);
+ reportOweFeeDto.setCommunityId(communityId);
+ reportOweFeeDto.setHasOweFee(hasOweFee);
+ reportOweFeeDto.setOwnerName(ownerName);
+ reportOweFeeDto.setFloorId(floorId);
+ reportOweFeeDto.setUnitId(unitId);
+ reportOweFeeDto.setRoomSubType(roomSubType);
+ reportOweFeeDto.setRoomNum(roomNum);
+ if (!StringUtil.isEmpty(configIds)) {
+ String[] tmpConfigIds = configIds.split(",");
+ reportOweFeeDto.setConfigIds(tmpConfigIds);
+ }
+ return getReportOweFeeBMOImpl.getAllFees(reportOweFeeDto);
+ }
}
--
Gitblit v1.8.0