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/dataReport/QueryDataReportFeeStatisticsCmd.java | 62 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryDataReportFeeStatisticsCmd.java b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryDataReportFeeStatisticsCmd.java
index 0904155..7ea7753 100644
--- a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryDataReportFeeStatisticsCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryDataReportFeeStatisticsCmd.java
@@ -19,6 +19,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import java.text.ParseException;
+import java.util.Calendar;
import java.util.List;
/**
@@ -86,6 +87,14 @@
queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
queryStatisticsDto.setFeeTypeCd(reqJson.getString("feeTypeCd"));
+ String monthFastDate = DateUtil.getFormatTimeStringB(DateUtil.getFirstDate(reqJson.getString("startDate")));
+ String monthLastDate = DateUtil.getFormatTimeStringB(DateUtil.getNextMonthFirstDate(reqJson.getString("startDate")));
+ String startDate = reqJson.getString("startDate");
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(DateUtil.getDateFromStringB(startDate));
+ calendar.add(Calendar.DAY_OF_MONTH, 1);
+ String endDate = DateUtil.getFormatTimeStringB(calendar.getTime());
+
// todo 鏌ヨ妤兼爧
FloorDto floorDto = new FloorDto();
floorDto.setFloorId(floorId);
@@ -98,25 +107,22 @@
long roomCount = baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
data.put("roomCount", roomCount);
- // todo 鏌ヨ绌虹疆鎴锋暟
- long freeCount = baseDataStatisticsImpl.getFreeRoomCount(queryStatisticsDto);
- data.put("freeCount", freeCount);
+
// todo 鏌ヨ 鍘嗗彶娆犺垂
//杩欓噷璁剧疆鏌ヨ鏈�1鏃� 涓嶇劧鍘嗗彶鍜屾�绘瑺璐逛竴鏍锋湁鐐瑰鎬�
- queryStatisticsDto.setStartDate(DateUtil.getFormatTimeStringB(DateUtil.getFirstDate(reqJson.getString("startDate"))));
+ queryStatisticsDto.setStartDate(monthFastDate);
double hisMonthOweFee = feeStatisticsImpl.getHisMonthOweFee(queryStatisticsDto);
data.put("hisMonthOweFee", hisMonthOweFee);
- queryStatisticsDto.setStartDate(reqJson.getString("startDate"));
// todo 鏌ヨ鎬绘瑺璐�
+ queryStatisticsDto.setEndDate(monthLastDate);
double oweFee = feeStatisticsImpl.getOweFee(queryStatisticsDto);
data.put("oweFee", oweFee);
// todo 鏈棩宸蹭氦鎴锋暟
- queryStatisticsDto.setStartDate(DateUtil.getFormatTimeStringB(DateUtil.getCurrentDate()) + " 00:00:00");
- queryStatisticsDto.setEndDate(DateUtil.getFormatTimeStringB(DateUtil.getCurrentDate()) + " 23:59:59");
- queryStatisticsDto.setHisDate(DateUtil.getFormatTimeStringB(DateUtil.getFirstDate()));
+ queryStatisticsDto.setStartDate(startDate);
+ queryStatisticsDto.setEndDate(endDate);
double todayReceivedRoomCount = feeStatisticsImpl.getReceivedRoomCount(queryStatisticsDto);
data.put("todayReceivedRoomCount", todayReceivedRoomCount);
@@ -125,26 +131,54 @@
data.put("todayReceivedRoomAmount", todayReceivedRoomAmount);
// todo 鍘嗗彶娆犺垂娓呯即鎴�
+ queryStatisticsDto.setStartDate(startDate);
+ queryStatisticsDto.setEndDate(endDate);
+ queryStatisticsDto.setHisDate(monthFastDate);
double hisOweReceivedRoomCount = feeStatisticsImpl.getHisOweReceivedRoomCount(queryStatisticsDto);
data.put("hisOweReceivedRoomCount", hisOweReceivedRoomCount);
// todo 鍘嗗彶娆犺垂娓呯即閲戦
double hisOweReceivedRoomAmount = feeStatisticsImpl.getHisOweReceivedRoomAmount(queryStatisticsDto);
data.put("hisOweReceivedRoomAmount", hisOweReceivedRoomAmount);
- // todo 杩欓噷鏃堕棿鍙堟敼鍥炴潵
- queryStatisticsDto.setStartDate(reqJson.getString("startDate"));
- queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
// todo 鏈湀宸叉敹鎴�
- double monthReceivedRoomCount = feeStatisticsImpl.getReceivedRoomCount(queryStatisticsDto);
+ queryStatisticsDto.setStartDate(monthFastDate);
+ queryStatisticsDto.setEndDate(monthLastDate);
+ double monthReceivedRoomCount = feeStatisticsImpl.getMonthReceivedDetailCount(queryStatisticsDto);
data.put("monthReceivedRoomCount", monthReceivedRoomCount);
- // todo 宸叉敹閲戦
- double monthReceivedRoomAmount = feeStatisticsImpl.getReceivedRoomAmount(queryStatisticsDto);
+ // todo 鏌ヨ鏀惰垂鎴�
+ long feeRoomCount = feeStatisticsImpl.getFeeRoomCount(queryStatisticsDto);
+ data.put("feeRoomCount", feeRoomCount);
+
+ // todo 璁＄畻娆犺垂鎴�
+ int oweRoomCount = feeStatisticsImpl.getOweRoomCount(queryStatisticsDto);
+ data.put("oweRoomCount", oweRoomCount);
+
+ // todo 鏈湀宸叉敹閲戦
+ double monthReceivedRoomAmount = feeStatisticsImpl.getMonthReceivedDetailAmount(queryStatisticsDto);
data.put("monthReceivedRoomAmount", monthReceivedRoomAmount);
// todo 鍓╀綑鏈敹
double curMonthOweFee = feeStatisticsImpl.getCurMonthOweFee(queryStatisticsDto);
data.put("curMonthOweFee", curMonthOweFee);
+ //todo 鏌ヨ褰撴湀搴旀敹
+ queryStatisticsDto.setStartDate(monthFastDate);
+ queryStatisticsDto.setEndDate(monthLastDate);
+ double curReceivableFee = feeStatisticsImpl.getCurReceivableFee(queryStatisticsDto);
+ data.put("curReceivableFee", curReceivableFee);
+
+// //todo 鏌ヨ 娆犺垂杩藉洖
+// queryStatisticsDto.setStartDate(monthFastDate);
+// queryStatisticsDto.setEndDate(monthLastDate);
+// double hisReceivedFee = feeStatisticsImpl.getHisReceivedFee(queryStatisticsDto);
+// data.put("hisReceivedFee", hisReceivedFee);
+//
+// //todo 鏌ヨ 棰勪氦璐圭敤
+// queryStatisticsDto.setStartDate(monthFastDate);
+// queryStatisticsDto.setEndDate(monthLastDate);
+// double preReceivedFee = feeStatisticsImpl.getPreReceivedFee(queryStatisticsDto);
+// data.put("preReceivedFee", preReceivedFee);
+
datas.add(data);
--
Gitblit v1.8.0