From 62f2b98b64f6726ca7cb90cbfa996deaac4ffba9 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 02 十一月 2023 14:09:04 +0800
Subject: [PATCH] 1、优化查询，便于模糊查询条件2、界面查询条件调整
---
service-report/src/main/java/com/java110/report/cmd/dataReport/QueryDataReportFeeStatisticsCmd.java | 104 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 76 insertions(+), 28 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 a41d694..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
@@ -6,7 +6,9 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.floor.FloorDto;
import com.java110.dto.report.QueryStatisticsDto;
+import com.java110.intf.community.IFloorV1InnerServiceSMO;
import com.java110.report.statistics.IBaseDataStatistics;
import com.java110.report.statistics.IFeeStatistics;
import com.java110.utils.exception.CmdException;
@@ -16,12 +18,9 @@
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
-import java.math.BigDecimal;
import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Calendar;
import java.util.List;
-import java.util.Map;
/**
* 鏌ヨ鏀惰垂鎯呭喌鍒嗘瀽
@@ -32,6 +31,9 @@
@Autowired
private IFeeStatistics feeStatisticsImpl;
+
+ @Autowired
+ private IFloorV1InnerServiceSMO floorV1InnerServiceSMOImpl;
@Autowired
private IBaseDataStatistics baseDataStatisticsImpl;
@@ -65,71 +67,117 @@
//todo 鏍规嵁妤兼爧ID寰幆鏌ヨ
for (String floorId : floorIds) {
//todo 鑾峰彇鍒版暟鎹�
- doGetData(floorId, data,reqJson);
+ doGetData(floorId, data, reqJson);
}
context.setResponseEntity(ResultVo.createResponseEntity(data));
}
/**
* 鏌ヨ鏁版嵁
+ *
* @param floorId
* @param datas
*/
- private void doGetData(String floorId, JSONArray datas,JSONObject reqJson) {
+ private void doGetData(String floorId, JSONArray datas, JSONObject reqJson) {
JSONObject data = new JSONObject();
QueryStatisticsDto queryStatisticsDto = new QueryStatisticsDto();
queryStatisticsDto.setCommunityId(reqJson.getString("communityId"));
queryStatisticsDto.setFloorId(floorId);
queryStatisticsDto.setStartDate(reqJson.getString("startDate"));
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);
+ floorDto.setCommunityId(reqJson.getString("communityId"));
+ List<FloorDto> floorDtos = floorV1InnerServiceSMOImpl.queryFloors(floorDto);
+ Assert.listOnlyOne(floorDtos, "妤兼爧涓嶅瓨鍦�");
+ data.put("floorNum", floorDtos.get(0).getFloorNum());
// todo 鏌ヨ鎴锋暟
long roomCount = baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
- data.put("roomCount",roomCount);
+ data.put("roomCount", roomCount);
- // todo 鏌ヨ绌虹疆鎴锋暟
- long freeCount = baseDataStatisticsImpl.getFreeRoomCount(queryStatisticsDto);
- data.put("freeCount",freeCount);
+
// todo 鏌ヨ 鍘嗗彶娆犺垂
+ //杩欓噷璁剧疆鏌ヨ鏈�1鏃� 涓嶇劧鍘嗗彶鍜屾�绘瑺璐逛竴鏍锋湁鐐瑰鎬�
+ queryStatisticsDto.setStartDate(monthFastDate);
double hisMonthOweFee = feeStatisticsImpl.getHisMonthOweFee(queryStatisticsDto);
- data.put("hisMonthOweFee",hisMonthOweFee);
+ data.put("hisMonthOweFee", hisMonthOweFee);
// todo 鏌ヨ鎬绘瑺璐�
+ queryStatisticsDto.setEndDate(monthLastDate);
double oweFee = feeStatisticsImpl.getOweFee(queryStatisticsDto);
- data.put("oweFee",oweFee);
+ 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);
+ data.put("todayReceivedRoomCount", todayReceivedRoomCount);
// todo 鏈棩宸蹭氦閲戦
double todayReceivedRoomAmount = feeStatisticsImpl.getReceivedRoomAmount(queryStatisticsDto);
- data.put("todayReceivedRoomAmount",todayReceivedRoomAmount);
+ data.put("todayReceivedRoomAmount", todayReceivedRoomAmount);
// todo 鍘嗗彶娆犺垂娓呯即鎴�
+ queryStatisticsDto.setStartDate(startDate);
+ queryStatisticsDto.setEndDate(endDate);
+ queryStatisticsDto.setHisDate(monthFastDate);
double hisOweReceivedRoomCount = feeStatisticsImpl.getHisOweReceivedRoomCount(queryStatisticsDto);
- data.put("hisOweReceivedRoomCount",hisOweReceivedRoomCount);
+ data.put("hisOweReceivedRoomCount", hisOweReceivedRoomCount);
// todo 鍘嗗彶娆犺垂娓呯即閲戦
double hisOweReceivedRoomAmount = feeStatisticsImpl.getHisOweReceivedRoomAmount(queryStatisticsDto);
- data.put("hisOweReceivedRoomAmount",hisOweReceivedRoomAmount);
+ data.put("hisOweReceivedRoomAmount", hisOweReceivedRoomAmount);
- // todo 杩欓噷鏃堕棿鍙堟敼鍥炴潵
- queryStatisticsDto.setStartDate(reqJson.getString("startDate"));
- queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
// todo 鏈湀宸叉敹鎴�
- double monthReceivedRoomCount = feeStatisticsImpl.getReceivedRoomCount(queryStatisticsDto);
- data.put("monthReceivedRoomCount",monthReceivedRoomCount);
+ queryStatisticsDto.setStartDate(monthFastDate);
+ queryStatisticsDto.setEndDate(monthLastDate);
+ double monthReceivedRoomCount = feeStatisticsImpl.getMonthReceivedDetailCount(queryStatisticsDto);
+ data.put("monthReceivedRoomCount", monthReceivedRoomCount);
- // todo 宸叉敹閲戦
- double monthReceivedRoomAmount = feeStatisticsImpl.getReceivedRoomAmount(queryStatisticsDto);
- data.put("monthReceivedRoomAmount",monthReceivedRoomAmount);
+ // 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);
+ 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