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 | 51 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 45 insertions(+), 6 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 bc5a0cf..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,7 @@
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;
@@ -215,8 +216,12 @@
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
reportFeeMonthStatisticsDto.setConfigId(configId);
reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
- reportFeeMonthStatisticsDto.setStartTime(startTime);
- reportFeeMonthStatisticsDto.setEndTime(endTime);
+ if (!StringUtil.isEmpty(startTime)) {
+ reportFeeMonthStatisticsDto.setStartTime(startTime + " 00:00:00");
+ }
+ if (!StringUtil.isEmpty(endTime)) {
+ reportFeeMonthStatisticsDto.setEndTime(endTime + " 23:59:59");
+ }
return getReportFeeMonthStatisticsBMOImpl.queryFeeBreakdown(reportFeeMonthStatisticsDto);
}
@@ -498,14 +503,48 @@
*
* @param communityId 灏忓尯ID
* @return
- * @serviceCode /reportFeeMonthStatistics/queryReportProficientCount
- * @path /app/reportFeeMonthStatistics/queryReportProficientCount
+ * @serviceCode /reportFeeMonthStatistics/queryReportProficient
+ * @path /app/reportFeeMonthStatistics/queryReportProficient
*/
- @RequestMapping(value = "/queryReportProficientCount", method = RequestMethod.GET)
- public ResponseEntity<String> queryReportProficientCount(@RequestParam(value = "communityId") String communityId) {
+ @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