From 8a2a463d46b3dce73015462c9f6a2a258dd25f5b Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 25 二月 2022 11:40:11 +0800
Subject: [PATCH] 优化diamante
---
service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java | 275 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 272 insertions(+), 3 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
old mode 100644
new mode 100755
index 49aa9ab..5eaa6b1
--- 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,9 @@
package com.java110.report.api;
import com.alibaba.fastjson.JSONObject;
+import com.java110.dto.RoomDto;
+import com.java110.dto.repair.RepairUserDto;
+import com.java110.dto.report.ReportDeposit;
import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
import com.java110.report.bmo.reportFeeMonthStatistics.IDeleteReportFeeMonthStatisticsBMO;
@@ -16,7 +19,8 @@
import org.springframework.web.bind.annotation.*;
import java.util.Calendar;
-
+import java.util.HashMap;
+import java.util.Map;
@RestController
@RequestMapping(value = "/reportFeeMonthStatistics")
@@ -24,8 +28,10 @@
@Autowired
private ISaveReportFeeMonthStatisticsBMO saveReportFeeMonthStatisticsBMOImpl;
+
@Autowired
private IUpdateReportFeeMonthStatisticsBMO updateReportFeeMonthStatisticsBMOImpl;
+
@Autowired
private IDeleteReportFeeMonthStatisticsBMO deleteReportFeeMonthStatisticsBMOImpl;
@@ -125,6 +131,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();
@@ -139,6 +146,9 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ if (!StringUtil.isEmpty(configIds)) {
+ reportFeeMonthStatisticsDto.setConfigIds(configIds.split(","));
+ }
return getReportFeeMonthStatisticsBMOImpl.queryReportFeeSummary(reportFeeMonthStatisticsDto);
}
@@ -160,6 +170,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();
@@ -174,6 +185,9 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ if (!StringUtil.isEmpty(configIds)) {
+ reportFeeMonthStatisticsDto.setConfigIds(configIds.split(","));
+ }
return getReportFeeMonthStatisticsBMOImpl.queryReportFloorUnitFeeSummary(reportFeeMonthStatisticsDto);
}
@@ -197,6 +211,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();
@@ -211,8 +226,13 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setConfigId(configId);
reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
- reportFeeMonthStatisticsDto.setStartTime(startTime);
- reportFeeMonthStatisticsDto.setEndTime(endTime);
+ reportFeeMonthStatisticsDto.setYearMonth(yearMonth);
+ if (!StringUtil.isEmpty(startTime)) {
+ reportFeeMonthStatisticsDto.setStartTime(startTime + " 00:00:00");
+ }
+ if (!StringUtil.isEmpty(endTime)) {
+ reportFeeMonthStatisticsDto.setEndTime(endTime + " 23:59:59");
+ }
return getReportFeeMonthStatisticsBMOImpl.queryFeeBreakdown(reportFeeMonthStatisticsDto);
}
@@ -307,9 +327,12 @@
@RequestParam(value = "roomId", required = false) String roomId,
@RequestParam(value = "roomNum", required = false) String roomNum,
@RequestParam(value = "primeRate", required = false) String primeRate,
+ @RequestParam(value = "state", required = false) String state,
+ @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
@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 = "page") int page,
@RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
@@ -323,10 +346,99 @@
reportFeeMonthStatisticsDto.setRoomId(roomId);
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setPrimeRate(primeRate);
+ reportFeeMonthStatisticsDto.setState(state);
+ reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
reportFeeMonthStatisticsDto.setConfigId(configId);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ reportFeeMonthStatisticsDto.setObjId(objId);
return getReportFeeMonthStatisticsBMOImpl.queryPayFeeDetail(reportFeeMonthStatisticsDto);
+ }
+
+ /**
+ * 鎶奸噾鎶ヨ〃
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryPayFeeDeposit
+ * @path /app/reportFeeMonthStatistics/queryPayFeeDeposit
+ */
+ @RequestMapping(value = "/queryPayFeeDeposit", method = RequestMethod.GET)
+ public ResponseEntity<String> queryPayFeeDeposit(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "configId", required = false) String configId,
+ @RequestParam(value = "feeId", required = false) String feeId,
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "payerObjType", required = false) String payerObjType,
+ @RequestParam(value = "state", required = false) String state,
+ @RequestParam(value = "detailState", required = false) String detailState,
+ @RequestParam(value = "floorId", required = false) String floorId,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "roomNum", required = false) String roomNum,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ ReportDeposit reportDeposit = new ReportDeposit();
+ reportDeposit.setPage(page);
+ reportDeposit.setRow(row);
+ reportDeposit.setConfigId(configId);
+ reportDeposit.setFeeId(feeId);
+ reportDeposit.setFeeStartTime(startTime);
+ reportDeposit.setFeeEndTime(endTime);
+ reportDeposit.setPayerObjType(payerObjType);
+ reportDeposit.setState(state);
+ reportDeposit.setDetailState(detailState);
+ reportDeposit.setCommunityId(communityId);
+ reportDeposit.setFloorId(floorId);
+ reportDeposit.setUnitId(unitId);
+ reportDeposit.setRoomNum(roomNum);
+ return getReportFeeMonthStatisticsBMOImpl.queryPayFeeDeposit(reportDeposit);
+ }
+
+ /**
+ * 鎶ヤ慨缁熻琛�
+ *
+ * @param communityId 灏忓尯id
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryRepair
+ * @path /app/reportFeeMonthStatistics/queryRepair
+ */
+ @RequestMapping(value = "/queryRepair", method = RequestMethod.GET)
+ public ResponseEntity<String> queryRepair(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "repairId", required = false) String repairId,
+ @RequestParam(value = "state", required = false) String state,
+ @RequestParam(value = "staffId", required = false) String staffId,
+ @RequestParam(value = "staffName", required = false) String staffName,
+ @RequestParam(value = "preStaffId", required = false) String preStaffId,
+ @RequestParam(value = "preStaffName", required = false) String preStaffName,
+ @RequestParam(value = "beginStartTime", required = false) String beginStartTime,
+ @RequestParam(value = "beginEndTime", required = false) String beginEndTime,
+ @RequestParam(value = "finishStartTime", required = false) String finishStartTime,
+ @RequestParam(value = "finishEndTime", required = false) String finishEndTime,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ RepairUserDto repairUserDto = new RepairUserDto();
+ repairUserDto.setCommunityId(communityId);
+ repairUserDto.setRepairId(repairId);
+ repairUserDto.setState(state);
+ repairUserDto.setStaffId(staffId);
+ repairUserDto.setStaffName(staffName);
+ repairUserDto.setPreStaffId(preStaffId);
+ repairUserDto.setPreStaffName(preStaffName);
+ if (!StringUtil.isEmpty(beginStartTime)) {
+ repairUserDto.setBeginStartTime(beginStartTime + " 00:00:00");
+ }
+ if (!StringUtil.isEmpty(beginEndTime)) {
+ repairUserDto.setBeginEndTime(beginEndTime + " 23:59:59");
+ }
+ if (!StringUtil.isEmpty(finishStartTime)) {
+ repairUserDto.setFinishStartTime(finishStartTime + " 00:00:00");
+ }
+ if (!StringUtil.isEmpty(finishEndTime)) {
+ repairUserDto.setFinishEndTime(finishEndTime + " 23:59:59");
+ }
+ repairUserDto.setPage(page);
+ repairUserDto.setRow(row);
+ return getReportFeeMonthStatisticsBMOImpl.queryRepair(repairUserDto);
}
/**
@@ -441,4 +553,161 @@
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
+ * inner join building_unit bu on t.unit_id = bu.unit_id and bu.status_cd = '0'
+ * inner join f_floor f on bu.floor_id = f.floor_id and f.status_cd = '0'
+ * where t.status_cd = '0'
+ * and not exists(
+ * select 1 from pay_fee pf where t.room_id = pf.payer_obj_id and pf.status_cd = '0' and pf.state = '2008001'
+ * )
+ *
+ * limit 10
+ */
+
+ /**
+ * 鏌ヨ璐圭敤鍒嗛」琛�
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryNoFeeRooms
+ * @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
+ ) {
+ RoomDto roomDto = new RoomDto();
+ roomDto.setCommunityId(communityId);
+ roomDto.setPage(page);
+ roomDto.setRow(row);
+ return getReportFeeMonthStatisticsBMOImpl.queryNoFeeRooms(roomDto);
+ }
+
+
+ /**
+ * 鏌ヨ鍗庡畞鐗╀笟 娆犺垂缁熻鎶ヨ〃
+ * 浣滆�咃細 鍚村鏂�
+ * 鏃堕棿锛�2021-08-13
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryHuaningOweFee
+ * @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
+ ) {
+ ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
+ reportFeeMonthStatisticsDto.setCommunityId(communityId);
+ reportFeeMonthStatisticsDto.setPage(page);
+ reportFeeMonthStatisticsDto.setRow(row);
+ reportFeeMonthStatisticsDto.setFeeYear(DateUtil.getYear() + "");
+ return getReportFeeMonthStatisticsBMOImpl.queryHuaningOweFee(reportFeeMonthStatisticsDto);
+ }
+
+ /**
+ * 鏌ヨ鍗庡畞鐗╀笟 娆犺垂缁熻鎶ヨ〃
+ * 浣滆�咃細 鍚村鏂�
+ * 鏃堕棿锛�2021-08-13
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryHuaningPayFee
+ * @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
+ ) {
+ Map paramInfo = new HashMap();
+ paramInfo.put("communityId", communityId);
+ paramInfo.put("year", year);
+ paramInfo.put("month", month);
+ paramInfo.put("page", page);
+ paramInfo.put("row", row);
+ return getReportFeeMonthStatisticsBMOImpl.queryHuaningPayFee(paramInfo);
+ }
+
+ /**
+ * 鏌ヨ鍗庡畞鐗╀笟 娆犺垂缁熻鎶ヨ〃
+ * 浣滆�咃細 鍚村鏂�
+ * 鏃堕棿锛�2021-08-13
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryHuaningPayFeeTwo
+ * @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
+ ) {
+ Map paramInfo = new HashMap();
+ paramInfo.put("communityId", communityId);
+ paramInfo.put("year", year);
+ paramInfo.put("month", month);
+ paramInfo.put("page", page);
+ paramInfo.put("row", row);
+ return getReportFeeMonthStatisticsBMOImpl.queryHuaningPayFeeTwo(paramInfo);
+ }
+
+ /**
+ * 鏌ヨ鍗庡畞鐗╀笟 娆犺垂缁熻鎶ヨ〃
+ * 浣滆�咃細 鍚村鏂�
+ * 鏃堕棿锛�2021-08-13
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryHuaningOweFeeDetail
+ * @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
+ ) {
+ Map paramInfo = new HashMap();
+ paramInfo.put("communityId", communityId);
+ paramInfo.put("year", year);
+ paramInfo.put("month", month);
+ paramInfo.put("page", page);
+ paramInfo.put("row", row);
+ return getReportFeeMonthStatisticsBMOImpl.queryHuaningOweFeeDetail(paramInfo);
+ }
+
+
}
--
Gitblit v1.8.0