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/ReportFeeMonthStatisticsApi.java | 349 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 326 insertions(+), 23 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 c56d806..a382013
--- 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,8 @@
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.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
import com.java110.po.reportFeeMonthStatistics.ReportFeeMonthStatisticsPo;
import com.java110.report.bmo.reportFeeMonthStatistics.IDeleteReportFeeMonthStatisticsBMO;
@@ -9,10 +11,15 @@
import com.java110.report.bmo.reportFeeMonthStatistics.IUpdateReportFeeMonthStatisticsBMO;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
@RestController
@RequestMapping(value = "/reportFeeMonthStatistics")
@@ -20,8 +27,10 @@
@Autowired
private ISaveReportFeeMonthStatisticsBMO saveReportFeeMonthStatisticsBMOImpl;
+
@Autowired
private IUpdateReportFeeMonthStatisticsBMO updateReportFeeMonthStatisticsBMOImpl;
+
@Autowired
private IDeleteReportFeeMonthStatisticsBMO deleteReportFeeMonthStatisticsBMOImpl;
@@ -148,16 +157,16 @@
*/
@RequestMapping(value = "/queryFloorUnitFeeSummary", method = RequestMethod.GET)
public ResponseEntity<String> queryFloorUnitFeeSummary(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "floorId", required = false) String floorId,
- @RequestParam(value = "floorNum", required = false) String floorNum,
- @RequestParam(value = "unitNum", required = false) String unitNum,
- @RequestParam(value = "unitId", required = false) String unitId,
- @RequestParam(value = "roomId", required = false) String roomId,
- @RequestParam(value = "roomNum", required = false) String roomNum,
- @RequestParam(value = "startTime", required = false) String startTime,
- @RequestParam(value = "endTime", required = false) String endTime,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestParam(value = "floorId", required = false) String floorId,
+ @RequestParam(value = "floorNum", required = false) String floorNum,
+ @RequestParam(value = "unitNum", required = false) String unitNum,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "roomId", required = false) String roomId,
+ @RequestParam(value = "roomNum", required = false) String roomNum,
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
reportFeeMonthStatisticsDto.setPage(page);
reportFeeMonthStatisticsDto.setRow(row);
@@ -183,16 +192,18 @@
*/
@RequestMapping(value = "/queryFeeBreakdown", method = RequestMethod.GET)
public ResponseEntity<String> queryFeeBreakdown(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "floorId", required = false) String floorId,
- @RequestParam(value = "floorNum", required = false) String floorNum,
- @RequestParam(value = "unitNum", required = false) String unitNum,
- @RequestParam(value = "unitId", required = false) String unitId,
- @RequestParam(value = "roomId", required = false) String roomId,
- @RequestParam(value = "roomNum", required = false) String roomNum,
- @RequestParam(value = "startTime", required = false) String startTime,
- @RequestParam(value = "endTime", required = false) String endTime,
- @RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
+ @RequestParam(value = "floorId", required = false) String floorId,
+ @RequestParam(value = "floorNum", required = false) String floorNum,
+ @RequestParam(value = "unitNum", required = false) String unitNum,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "roomId", required = false) String roomId,
+ @RequestParam(value = "roomNum", required = false) String roomNum,
+ @RequestParam(value = "configId", required = false) String configId,
+ @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
reportFeeMonthStatisticsDto.setPage(page);
reportFeeMonthStatisticsDto.setRow(row);
@@ -203,8 +214,14 @@
reportFeeMonthStatisticsDto.setUnitNum(unitNum);
reportFeeMonthStatisticsDto.setRoomId(roomId);
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
- reportFeeMonthStatisticsDto.setStartTime(startTime);
- reportFeeMonthStatisticsDto.setEndTime(endTime);
+ reportFeeMonthStatisticsDto.setConfigId(configId);
+ reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
+ if (!StringUtil.isEmpty(startTime)) {
+ reportFeeMonthStatisticsDto.setStartTime(startTime + " 00:00:00");
+ }
+ if (!StringUtil.isEmpty(endTime)) {
+ reportFeeMonthStatisticsDto.setEndTime(endTime + " 23:59:59");
+ }
return getReportFeeMonthStatisticsBMOImpl.queryFeeBreakdown(reportFeeMonthStatisticsDto);
}
@@ -218,6 +235,45 @@
*/
@RequestMapping(value = "/queryFeeDetail", method = RequestMethod.GET)
public ResponseEntity<String> queryFeeDetail(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "floorId", required = false) String floorId,
+ @RequestParam(value = "floorNum", required = false) String floorNum,
+ @RequestParam(value = "unitNum", required = false) String unitNum,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "roomId", required = false) String roomId,
+ @RequestParam(value = "roomNum", required = false) String roomNum,
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "feeName", required = false) String feeName,
+ @RequestParam(value = "configId", required = false) String configId,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
+ reportFeeMonthStatisticsDto.setPage(page);
+ reportFeeMonthStatisticsDto.setRow(row);
+ reportFeeMonthStatisticsDto.setCommunityId(communityId);
+ reportFeeMonthStatisticsDto.setFloorId(floorId);
+ reportFeeMonthStatisticsDto.setFloorNum(floorNum);
+ reportFeeMonthStatisticsDto.setUnitId(unitId);
+ reportFeeMonthStatisticsDto.setUnitNum(unitNum);
+ reportFeeMonthStatisticsDto.setRoomId(roomId);
+ reportFeeMonthStatisticsDto.setRoomNum(roomNum);
+ reportFeeMonthStatisticsDto.setFeeName(feeName);
+ reportFeeMonthStatisticsDto.setConfigId(configId);
+ reportFeeMonthStatisticsDto.setStartTime(startTime);
+ reportFeeMonthStatisticsDto.setEndTime(endTime);
+ return getReportFeeMonthStatisticsBMOImpl.queryFeeDetail(reportFeeMonthStatisticsDto);
+ }
+
+ /**
+ * 鏌ヨ璐圭敤鍒嗛」琛�
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryOweFeeDetail
+ * @path /app/reportFeeMonthStatistics/queryOweFeeDetail
+ */
+ @RequestMapping(value = "/queryOweFeeDetail", method = RequestMethod.GET)
+ public ResponseEntity<String> queryOweFeeDetail(@RequestParam(value = "communityId") String communityId,
@RequestParam(value = "floorId", required = false) String floorId,
@RequestParam(value = "floorNum", required = false) String floorNum,
@RequestParam(value = "unitNum", required = false) String unitNum,
@@ -240,8 +296,255 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
- return getReportFeeMonthStatisticsBMOImpl.queryFeeDetail(reportFeeMonthStatisticsDto);
+ return getReportFeeMonthStatisticsBMOImpl.queryOweFeeDetail(reportFeeMonthStatisticsDto);
}
+ /**
+ * 缂磋垂鏄庣粏琛�
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryPayFeeDetail
+ * @path /app/reportFeeMonthStatistics/queryPayFeeDetail
+ */
+ @RequestMapping(value = "/queryPayFeeDetail", method = RequestMethod.GET)
+ public ResponseEntity<String> queryPayFeeDetail(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "floorId", required = false) String floorId,
+ @RequestParam(value = "floorNum", required = false) String floorNum,
+ @RequestParam(value = "unitNum", required = false) String unitNum,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "roomId", required = false) String roomId,
+ @RequestParam(value = "roomNum", required = false) String roomNum,
+ @RequestParam(value = "primeRate", required = false) String primeRate,
+ @RequestParam(value = "configId", required = false) String configId,
+ @RequestParam(value = "startTime", required = false) String startTime,
+ @RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
+ reportFeeMonthStatisticsDto.setPage(page);
+ reportFeeMonthStatisticsDto.setRow(row);
+ reportFeeMonthStatisticsDto.setCommunityId(communityId);
+ reportFeeMonthStatisticsDto.setFloorId(floorId);
+ reportFeeMonthStatisticsDto.setFloorNum(floorNum);
+ reportFeeMonthStatisticsDto.setUnitId(unitId);
+ reportFeeMonthStatisticsDto.setUnitNum(unitNum);
+ reportFeeMonthStatisticsDto.setRoomId(roomId);
+ reportFeeMonthStatisticsDto.setRoomNum(roomNum);
+ reportFeeMonthStatisticsDto.setPrimeRate(primeRate);
+ reportFeeMonthStatisticsDto.setConfigId(configId);
+ reportFeeMonthStatisticsDto.setStartTime(startTime);
+ reportFeeMonthStatisticsDto.setEndTime(endTime);
+ return getReportFeeMonthStatisticsBMOImpl.queryPayFeeDetail(reportFeeMonthStatisticsDto);
+ }
+
+ /**
+ * 鎶ヤ慨缁熻琛�
+ *
+ * @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);
+ }
+
+ /**
+ * 鏌ヨ璐圭敤鍒嗛」琛�
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryDeadlineFee
+ * @path /app/reportFeeMonthStatistics/queryDeadlineFee
+ */
+ @RequestMapping(value = "/queryDeadlineFee", method = RequestMethod.GET)
+ public ResponseEntity<String> queryDeadlineFee(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "floorId", required = false) String floorId,
+ @RequestParam(value = "floorNum", required = false) String floorNum,
+ @RequestParam(value = "unitNum", required = false) String unitNum,
+ @RequestParam(value = "unitId", required = false) String unitId,
+ @RequestParam(value = "roomId", required = false) String roomId,
+ @RequestParam(value = "roomNum", required = false) String roomNum,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row) {
+ ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
+ reportFeeMonthStatisticsDto.setPage(page);
+ reportFeeMonthStatisticsDto.setRow(row);
+ reportFeeMonthStatisticsDto.setCommunityId(communityId);
+ reportFeeMonthStatisticsDto.setFloorId(floorId);
+ reportFeeMonthStatisticsDto.setFloorNum(floorNum);
+ reportFeeMonthStatisticsDto.setUnitId(unitId);
+ reportFeeMonthStatisticsDto.setUnitNum(unitNum);
+ reportFeeMonthStatisticsDto.setRoomId(roomId);
+ reportFeeMonthStatisticsDto.setRoomNum(roomNum);
+ reportFeeMonthStatisticsDto.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_MONTH, 7);
+ reportFeeMonthStatisticsDto.setEndTime(DateUtil.getFormatTimeString(calendar.getTime(), DateUtil.DATE_FORMATE_STRING_A));
+ return getReportFeeMonthStatisticsBMOImpl.queryDeadlineFee(reportFeeMonthStatisticsDto);
+ }
+
+
+ /**
+ * 鏌ヨ璐圭敤鍒嗛」琛�
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryPrePaymentCount
+ * @path /app/reportFeeMonthStatistics/queryPrePaymentCount
+ */
+ @RequestMapping(value = "/queryPrePaymentCount", method = RequestMethod.GET)
+ public ResponseEntity<String> queryPrePaymentCount(@RequestParam(value = "communityId") String communityId) {
+ ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
+ reportFeeMonthStatisticsDto.setCommunityId(communityId);
+ reportFeeMonthStatisticsDto.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_MONTH, 7);
+ reportFeeMonthStatisticsDto.setEndTime(DateUtil.getFormatTimeString(calendar.getTime(), DateUtil.DATE_FORMATE_STRING_A));
+ return getReportFeeMonthStatisticsBMOImpl.queryPrePaymentCount(reportFeeMonthStatisticsDto);
+ }
+
+ /**
+ * 鏌ヨ鍒版湡鎻愰啋
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryDeadlineCount
+ * @path /app/reportFeeMonthStatistics/queryDeadlineCount
+ */
+ @RequestMapping(value = "/queryDeadlineCount", method = RequestMethod.GET)
+ public ResponseEntity<String> queryDeadlineCount(@RequestParam(value = "communityId") String communityId) {
+ ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
+ reportFeeMonthStatisticsDto.setCommunityId(communityId);
+ reportFeeMonthStatisticsDto.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_MONTH, 7);
+ reportFeeMonthStatisticsDto.setEndTime(DateUtil.getFormatTimeString(calendar.getTime(), DateUtil.DATE_FORMATE_STRING_A));
+ return getReportFeeMonthStatisticsBMOImpl.queryDeadlinePaymentCount(reportFeeMonthStatisticsDto);
+ }
+
+ /**
+ * 鏌ヨ璐圭敤鍒嗛」琛�
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryPrePayment
+ * @path /app/reportFeeMonthStatistics/queryPrePayment
+ */
+ @RequestMapping(value = "/queryPrePayment", method = RequestMethod.GET)
+ public ResponseEntity<String> queryPrePayment(@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.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_MONTH, 7);
+ reportFeeMonthStatisticsDto.setEndTime(DateUtil.getFormatTimeString(calendar.getTime(), DateUtil.DATE_FORMATE_STRING_A));
+ return getReportFeeMonthStatisticsBMOImpl.queryPrePayment(reportFeeMonthStatisticsDto);
+ }
+
+ /**
+ * 鏌ヨ璐圭敤鍒嗛」琛�
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /reportFeeMonthStatistics/queryOwePaymentCount
+ * @path /app/reportFeeMonthStatistics/queryOwePaymentCount
+ */
+ @RequestMapping(value = "/queryOwePaymentCount", method = RequestMethod.GET)
+ public ResponseEntity<String> queryOwePaymentCount(@RequestParam(value = "communityId") String communityId) {
+ ReportFeeMonthStatisticsDto reportFeeMonthStatisticsDto = new ReportFeeMonthStatisticsDto();
+ reportFeeMonthStatisticsDto.setCommunityId(communityId);
+ 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);
+ }
}
--
Gitblit v1.8.0