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/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java
index 7318a62..4907050 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java
@@ -59,6 +59,9 @@
queryStatisticsDto.setCommunityId(reqJson.getString("communityId"));
queryStatisticsDto.setStartDate(reqJson.getString("startDate"));
queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
+ if(reqJson.containsKey("endDate") && !reqJson.getString("endDate").contains(":")) {
+ queryStatisticsDto.setEndDate(reqJson.getString("endDate") + " 23:59:59");
+ }
queryStatisticsDto.setConfigId(reqJson.getString("configId"));
queryStatisticsDto.setFloorId(reqJson.getString("floorId"));
queryStatisticsDto.setObjName(reqJson.getString("objName"));
@@ -91,12 +94,11 @@
//todo 鎴垮眿鏁�
long roomCount = baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
- //todo 绌洪棽鎴垮眿鏁�
+ //todo 鏀惰垂鎴垮眿鏁�
long feeRoomCount = feeStatisticsImpl.getFeeRoomCount(queryStatisticsDto);
- //todo 宸叉敹璐规埛鏁�
- double monthReceivedRoomCount = feeStatisticsImpl.getReceivedRoomCount(queryStatisticsDto);
- //int oweRoomCount = feeStatisticsImpl.getOweRoomCount(queryStatisticsDto);
+ //todo 娆犺垂鎴锋暟
+ int oweRoomCount = feeStatisticsImpl.getOweRoomCount(queryStatisticsDto);
JSONObject data = new JSONObject();
data.put("hisOweFee", hisOweFee);
@@ -106,7 +108,7 @@
data.put("receivedFee", receivedFee);
data.put("roomCount", roomCount);
data.put("feeRoomCount", feeRoomCount);
- data.put("oweRoomCount", feeRoomCount-monthReceivedRoomCount);
+ data.put("oweRoomCount", oweRoomCount);
data.put("curReceivableFee", curReceivableFee);
JSONArray datas = new JSONArray();
--
Gitblit v1.8.0