From b555bdde876199ea4d3f2f9126f20f6e94b3e890 Mon Sep 17 00:00:00 2001
From: shane <88386378@qq.com>
Date: 星期一, 12 七月 2021 22:30:14 +0800
Subject: [PATCH] 社区新闻大类设置隐藏与显示过滤条件
---
service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java | 240 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 229 insertions(+), 11 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 8b131bb..93b8522
--- 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;
@@ -15,8 +17,9 @@
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")
@@ -24,8 +27,10 @@
@Autowired
private ISaveReportFeeMonthStatisticsBMO saveReportFeeMonthStatisticsBMOImpl;
+
@Autowired
private IUpdateReportFeeMonthStatisticsBMO updateReportFeeMonthStatisticsBMOImpl;
+
@Autowired
private IDeleteReportFeeMonthStatisticsBMO deleteReportFeeMonthStatisticsBMOImpl;
@@ -137,8 +142,8 @@
reportFeeMonthStatisticsDto.setUnitNum(unitNum);
reportFeeMonthStatisticsDto.setRoomId(roomId);
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
- reportFeeMonthStatisticsDto.setStartTime(StringUtil.isEmpty(startTime) ? null : startTime + "-01");
- reportFeeMonthStatisticsDto.setEndTime(StringUtil.isEmpty(endTime) ? null : endTime + "-01");
+ reportFeeMonthStatisticsDto.setStartTime(startTime);
+ reportFeeMonthStatisticsDto.setEndTime(endTime);
return getReportFeeMonthStatisticsBMOImpl.queryReportFeeSummary(reportFeeMonthStatisticsDto);
}
@@ -172,8 +177,8 @@
reportFeeMonthStatisticsDto.setUnitNum(unitNum);
reportFeeMonthStatisticsDto.setRoomId(roomId);
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
- reportFeeMonthStatisticsDto.setStartTime(StringUtil.isEmpty(startTime) ? null : startTime + "-01");
- reportFeeMonthStatisticsDto.setEndTime(StringUtil.isEmpty(endTime) ? null : endTime + "-01");
+ reportFeeMonthStatisticsDto.setStartTime(startTime);
+ reportFeeMonthStatisticsDto.setEndTime(endTime);
return getReportFeeMonthStatisticsBMOImpl.queryReportFloorUnitFeeSummary(reportFeeMonthStatisticsDto);
}
@@ -193,6 +198,8 @@
@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,
@@ -207,8 +214,10 @@
reportFeeMonthStatisticsDto.setUnitNum(unitNum);
reportFeeMonthStatisticsDto.setRoomId(roomId);
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
- reportFeeMonthStatisticsDto.setStartTime(StringUtil.isEmpty(startTime) ? null : startTime + "-01");
- reportFeeMonthStatisticsDto.setEndTime(StringUtil.isEmpty(endTime) ? null : endTime + "-01");
+ reportFeeMonthStatisticsDto.setConfigId(configId);
+ reportFeeMonthStatisticsDto.setFeeTypeCd(feeTypeCd);
+ reportFeeMonthStatisticsDto.setStartTime(startTime);
+ reportFeeMonthStatisticsDto.setEndTime(endTime);
return getReportFeeMonthStatisticsBMOImpl.queryFeeBreakdown(reportFeeMonthStatisticsDto);
}
@@ -230,6 +239,8 @@
@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();
@@ -242,8 +253,10 @@
reportFeeMonthStatisticsDto.setUnitNum(unitNum);
reportFeeMonthStatisticsDto.setRoomId(roomId);
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
- reportFeeMonthStatisticsDto.setStartTime(StringUtil.isEmpty(startTime) ? null : startTime + "-01");
- reportFeeMonthStatisticsDto.setEndTime(StringUtil.isEmpty(endTime) ? null : endTime + "-01");
+ reportFeeMonthStatisticsDto.setFeeName(feeName);
+ reportFeeMonthStatisticsDto.setConfigId(configId);
+ reportFeeMonthStatisticsDto.setStartTime(startTime);
+ reportFeeMonthStatisticsDto.setEndTime(endTime);
return getReportFeeMonthStatisticsBMOImpl.queryFeeDetail(reportFeeMonthStatisticsDto);
}
@@ -277,9 +290,130 @@
reportFeeMonthStatisticsDto.setUnitNum(unitNum);
reportFeeMonthStatisticsDto.setRoomId(roomId);
reportFeeMonthStatisticsDto.setRoomNum(roomNum);
- reportFeeMonthStatisticsDto.setStartTime(StringUtil.isEmpty(startTime) ? null : startTime + "-01");
- reportFeeMonthStatisticsDto.setEndTime(StringUtil.isEmpty(endTime) ? null : endTime + "-01");
+ reportFeeMonthStatisticsDto.setStartTime(startTime);
+ reportFeeMonthStatisticsDto.setEndTime(endTime);
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);
}
@@ -303,6 +437,25 @@
}
/**
+ * 鏌ヨ鍒版湡鎻愰啋
+ *
+ * @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
@@ -325,4 +478,69 @@
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