From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/api/ReportFeeMonthStatisticsApi.java | 50 ++++++++++++++++++--------------------------------
1 files changed, 18 insertions(+), 32 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 b2a2782..ee4d49c 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,12 +1,11 @@
package com.java110.report.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.FloorDto;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.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.dto.reportFee.ReportFeeMonthStatisticsDto;
+import com.java110.po.reportFee.ReportFeeMonthStatisticsPo;
import com.java110.report.bmo.reportFeeMonthStatistics.IDeleteReportFeeMonthStatisticsBMO;
import com.java110.report.bmo.reportFeeMonthStatistics.IGetReportFeeMonthStatisticsBMO;
import com.java110.report.bmo.reportFeeMonthStatistics.ISaveReportFeeMonthStatisticsBMO;
@@ -21,7 +20,6 @@
import java.util.Calendar;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
@RestController
@@ -114,7 +112,6 @@
reportFeeMonthStatisticsDto.setCommunityId(communityId);
return getReportFeeMonthStatisticsBMOImpl.get(reportFeeMonthStatisticsDto);
}
-
/**
@@ -301,6 +298,8 @@
@RequestParam(value = "configId", required = false) String configId,
@RequestParam(value = "startTime", required = false) String startTime,
@RequestParam(value = "endTime", required = false) String endTime,
+ @RequestParam(value = "feeStartTime", required = false) String feeStartTime,
+ @RequestParam(value = "feeEndTime", required = false) String feeEndTime,
@RequestParam(value = "objId", required = false) String objId,
@RequestParam(value = "roomName", required = false) String roomName,
@RequestParam(value = "page") int page,
@@ -321,9 +320,11 @@
reportFeeMonthStatisticsDto.setConfigId(configId);
reportFeeMonthStatisticsDto.setStartTime(startTime);
reportFeeMonthStatisticsDto.setEndTime(endTime);
+ reportFeeMonthStatisticsDto.setFeeStartTime(feeStartTime);
+ reportFeeMonthStatisticsDto.setFeeEndTime(feeEndTime);
reportFeeMonthStatisticsDto.setObjId(objId);
- if(!StringUtil.isEmpty(roomName)){
- String[] roomNameArray = roomName.split("-",3);
+ if (!StringUtil.isEmpty(roomName)) {
+ String[] roomNameArray = roomName.split("-", 3);
reportFeeMonthStatisticsDto.setFloorNum(roomNameArray[0]);
reportFeeMonthStatisticsDto.setUnitNum(roomNameArray[1]);
reportFeeMonthStatisticsDto.setRoomNum(roomNameArray[2]);
@@ -496,29 +497,6 @@
*
* @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
*/
@@ -586,7 +564,8 @@
reportFeeMonthStatisticsDto.setFloorNum(floorNum);
reportFeeMonthStatisticsDto.setPage(page);
reportFeeMonthStatisticsDto.setRow(row);
- reportFeeMonthStatisticsDto.setFeeYear(DateUtil.getYear() + "");
+ reportFeeMonthStatisticsDto.setStartTime(DateUtil.getYear() + "-01-01");
+ reportFeeMonthStatisticsDto.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
return getReportFeeMonthStatisticsBMOImpl.queryHuaningOweFee(reportFeeMonthStatisticsDto);
}
@@ -618,6 +597,9 @@
paramInfo.put("month", month);
paramInfo.put("page", page);
paramInfo.put("row", row);
+ paramInfo.put("startTime", DateUtil.getYear() + "-01-01");
+ paramInfo.put("endTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_Q)+"-01");
+ paramInfo.put("nextMonthTime",DateUtil.getFormatTimeStringB(DateUtil.getNextMonthFirstDate()));
return getReportFeeMonthStatisticsBMOImpl.queryHuaningPayFee(paramInfo);
}
@@ -660,6 +642,7 @@
public ResponseEntity<String> queryHuaningOweFeeDetail(@RequestParam(value = "communityId") String communityId,
@RequestParam(value = "year") int year,
@RequestParam(value = "month") int month,
+ @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
Map paramInfo = new HashMap();
@@ -668,6 +651,9 @@
paramInfo.put("month", month);
paramInfo.put("page", page);
paramInfo.put("row", row);
+ paramInfo.put("feeTypeCd", feeTypeCd);
+ paramInfo.put("startTime", DateUtil.getYear() + "-01-01");
+ paramInfo.put("endTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
return getReportFeeMonthStatisticsBMOImpl.queryHuaningOweFeeDetail(paramInfo);
}
--
Gitblit v1.8.0