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 | 113 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 61 insertions(+), 52 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 93a19cf..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;
@@ -16,14 +17,11 @@
import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.Calendar;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@RestController
@@ -135,6 +133,7 @@
@RequestParam(value = "roomNum", required = false) String roomNum,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "configIds", required = false) String configIds,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
@@ -149,6 +148,9 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ if (!StringUtil.isEmpty(configIds)) {
+ reportFeeMonthStatisticsDto.setConfigIds(configIds.split(","));
+ }
return getReportFeeMonthStatisticsBMOImpl.queryReportFeeSummary(reportFeeMonthStatisticsDto);
}
@@ -170,6 +172,7 @@
@RequestParam(value = "roomNum", required = false) String roomNum,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "configIds", required = false) String configIds,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
@@ -184,6 +187,9 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ if (!StringUtil.isEmpty(configIds)) {
+ reportFeeMonthStatisticsDto.setConfigIds(configIds.split(","));
+ }
return getReportFeeMonthStatisticsBMOImpl.queryReportFloorUnitFeeSummary(reportFeeMonthStatisticsDto);
}
@@ -207,6 +213,7 @@
@RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "yearMonth", required = false) String yearMonth,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
@@ -221,6 +228,7 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setConfigId(configId);
reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
+ reportFeeMonthStatisticsDto.setYearMonth(yearMonth);
if (!StringUtil.isEmpty(startTime)) {
reportFeeMonthStatisticsDto.setStartTime(startTime + " 00:00:00");
}
@@ -246,6 +254,7 @@
@RequestParam(value = "unitId", required = false) String unitId,
@RequestParam(value = "roomId", required = false) String roomId,
@RequestParam(value = "roomNum", required = false) String roomNum,
+ @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
@RequestParam(value = "feeName", required = false) String feeName,
@@ -264,6 +273,7 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setFeeName(feeName);
reportFeeMonthStatisticsDto.setConfigId(configId);
+ reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
return getReportFeeMonthStatisticsBMOImpl.queryFeeDetail(reportFeeMonthStatisticsDto);
@@ -287,6 +297,7 @@
@RequestParam(value = "roomNum", required = false) String roomNum,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "objName", required = false) String objName,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
@@ -301,6 +312,7 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ reportFeeMonthStatisticsDto.setObjName(objName);
return getReportFeeMonthStatisticsBMOImpl.queryOweFeeDetail(reportFeeMonthStatisticsDto);
}
@@ -326,6 +338,8 @@
@RequestParam(value = "configId", required = false) String configId,
@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();
@@ -344,6 +358,13 @@
reportFeeMonthStatisticsDto.setConfigId(configId);
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);
}
@@ -545,22 +566,6 @@
return getReportFeeMonthStatisticsBMOImpl.queryOwePaymentCount(reportFeeMonthStatisticsDto);
}
-
- /**
- * 鏌ヨ璐圭敤鍒嗛」琛�
- *
- * @param communityId 灏忓尯ID
- * @return
- * @serviceCode /reportFeeMonthStatistics/queryReportProficient
- * @path /app/reportFeeMonthStatistics/queryReportProficient
- */
- @RequestMapping(value = "/queryReportProficient", method = RequestMethod.GET)
- public ResponseEntity<String> queryReportProficient(@RequestParam(value = "communityId") String communityId) {
- ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
- reportFeeMonthStatisticsDto.setCommunityId(communityId);
- return getReportFeeMonthStatisticsBMOImpl.queryReportProficientCount(reportFeeMonthStatisticsDto);
- }
-
/**
* 鏌ヨ鏈敹璐规埧灞�
* select t.* from building_room t
@@ -583,11 +588,9 @@
* @path /app/reportFeeMonthStatistics/queryNoFeeRooms
*/
@RequestMapping(value = "/queryNoFeeRooms", method = RequestMethod.GET)
- public ResponseEntity<String> queryNoFeeRooms(
- @RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row
- ) {
+ public ResponseEntity<String> queryNoFeeRooms(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
RoomDto roomDto = new RoomDto();
roomDto.setCommunityId(communityId);
roomDto.setPage(page);
@@ -607,13 +610,17 @@
* @path /app/reportFeeMonthStatistics/queryHuaningOweFee
*/
@RequestMapping(value = "/queryHuaningOweFee", method = RequestMethod.GET)
- public ResponseEntity<String> queryHuaningOweFee(
- @RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row
- ) {
+ public ResponseEntity<String> queryHuaningOweFee(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "configId", required = false) String configId,
+ @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
+ @RequestParam(value = "floorNum", required = false) String floorNum,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
reportFeeMonthStatisticsDto.setCommunityId(communityId);
+ reportFeeMonthStatisticsDto.setConfigId(configId);
+ reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
+ reportFeeMonthStatisticsDto.setFloorNum(floorNum);
reportFeeMonthStatisticsDto.setPage(page);
reportFeeMonthStatisticsDto.setRow(row);
reportFeeMonthStatisticsDto.setFeeYear(DateUtil.getYear() + "");
@@ -631,21 +638,26 @@
* @path /app/reportFeeMonthStatistics/queryHuaningPayFee
*/
@RequestMapping(value = "/queryHuaningPayFee", method = RequestMethod.GET)
- public ResponseEntity<String> queryHuaningPayFee(
- @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> queryHuaningPayFee(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "configId", required = false) String configId,
+ @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
+ @RequestParam(value = "floorNum", required = false) String floorNum,
+ @RequestParam(value = "year", required = false) int year,
+ @RequestParam(value = "month", required = false) int month,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
Map paramInfo = new HashMap();
paramInfo.put("communityId", communityId);
+ paramInfo.put("configId", configId);
+ paramInfo.put("feeTypeCd", feeTypeCd);
+ paramInfo.put("floorNum", floorNum);
paramInfo.put("year", year);
paramInfo.put("month", month);
paramInfo.put("page", page);
paramInfo.put("row", row);
return getReportFeeMonthStatisticsBMOImpl.queryHuaningPayFee(paramInfo);
}
+
/**
* 鏌ヨ鍗庡畞鐗╀笟 娆犺垂缁熻鎶ヨ〃
* 浣滆�咃細 鍚村鏂�
@@ -657,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);
@@ -672,6 +682,7 @@
paramInfo.put("row", row);
return getReportFeeMonthStatisticsBMOImpl.queryHuaningPayFeeTwo(paramInfo);
}
+
/**
* 鏌ヨ鍗庡畞鐗╀笟 娆犺垂缁熻鎶ヨ〃
* 浣滆�咃細 鍚村鏂�
@@ -683,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