From b06ccd76e50812d81ee689dcd609bb02ac5c4ed4 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 11 八月 2022 14:48:52 +0800
Subject: [PATCH] 1、优化页面展示行问题
---
service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java b/service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java
index cc10983..d24ebff 100755
--- a/service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java
@@ -1,6 +1,7 @@
package com.java110.report.api;
import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.FloorDto;
import com.java110.dto.RoomDto;
import com.java110.dto.repair.RepairUserDto;
import com.java110.dto.report.ReportDeposit;
@@ -20,6 +21,7 @@
import java.util.Calendar;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@RestController
@@ -337,6 +339,7 @@
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "objId", required = false) String objId,
+ @RequestParam(value = "roomName", required = false) String roomName,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
@@ -356,6 +359,12 @@
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
reportFeeMonthStatisticsDto.setObjId(objId);
+ if(!StringUtil.isEmpty(roomName)){
+ String[] roomNameArray = roomName.split("-");
+ reportFeeMonthStatisticsDto.setFloorNum(roomNameArray[0]);
+ reportFeeMonthStatisticsDto.setUnitNum(roomNameArray[1]);
+ reportFeeMonthStatisticsDto.setRoomNum(roomNameArray[2]);
+ }
return getReportFeeMonthStatisticsBMOImpl.queryPayFeeDetail(reportFeeMonthStatisticsDto);
}
@@ -660,13 +669,11 @@
* @path /app/reportFeeMonthStatistics/queryHuaningPayFeeTwo
*/
@RequestMapping(value = "/queryHuaningPayFeeTwo", method = RequestMethod.GET)
- public ResponseEntity<String> queryHuaningPayFeeTwo(
- @RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "year") int year,
- @RequestParam(value = "month") int month,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row
- ) {
+ public ResponseEntity<String> queryHuaningPayFeeTwo(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "year") int year,
+ @RequestParam(value = "month") int month,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
Map paramInfo = new HashMap();
paramInfo.put("communityId", communityId);
paramInfo.put("year", year);
@@ -687,13 +694,11 @@
* @path /app/reportFeeMonthStatistics/queryHuaningOweFeeDetail
*/
@RequestMapping(value = "/queryHuaningOweFeeDetail", method = RequestMethod.GET)
- public ResponseEntity<String> queryHuaningOweFeeDetail(
- @RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "year") int year,
- @RequestParam(value = "month") int month,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row
- ) {
+ public ResponseEntity<String> queryHuaningOweFeeDetail(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "year") int year,
+ @RequestParam(value = "month") int month,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
Map paramInfo = new HashMap();
paramInfo.put("communityId", communityId);
paramInfo.put("year", year);
--
Gitblit v1.8.0