From b173d31976fc4731b7c247d4038de92134eba317 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 29 六月 2023 11:42:17 +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 | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 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..ee20a1a 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,8 @@
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.List;
-import java.util.Map;
/**
* 鏌ヨ鏀惰垂鎯呭喌鍒嗘瀽
@@ -32,6 +30,9 @@
@Autowired
private IFeeStatistics feeStatisticsImpl;
+
+ @Autowired
+ private IFloorV1InnerServiceSMO floorV1InnerServiceSMOImpl;
@Autowired
private IBaseDataStatistics baseDataStatisticsImpl;
@@ -65,71 +66,81 @@
//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"));
+
+ // 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);
+ data.put("freeCount", freeCount);
// todo 鏌ヨ 鍘嗗彶娆犺垂
double hisMonthOweFee = feeStatisticsImpl.getHisMonthOweFee(queryStatisticsDto);
- data.put("hisMonthOweFee",hisMonthOweFee);
+ data.put("hisMonthOweFee", hisMonthOweFee);
// todo 鏌ヨ鎬绘瑺璐�
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.setStartDate(DateUtil.getFormatTimeStringB(DateUtil.getCurrentDate()) + " 00:00:00");
+ queryStatisticsDto.setEndDate(DateUtil.getFormatTimeStringB(DateUtil.getCurrentDate()) + " 23:59:59");
queryStatisticsDto.setHisDate(DateUtil.getFormatTimeStringB(DateUtil.getFirstDate()));
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 鍘嗗彶娆犺垂娓呯即鎴�
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);
+ data.put("monthReceivedRoomCount", monthReceivedRoomCount);
// todo 宸叉敹閲戦
double monthReceivedRoomAmount = feeStatisticsImpl.getReceivedRoomAmount(queryStatisticsDto);
- data.put("monthReceivedRoomAmount",monthReceivedRoomAmount);
+ data.put("monthReceivedRoomAmount", monthReceivedRoomAmount);
// todo 鍓╀綑鏈敹
double curMonthOweFee = feeStatisticsImpl.getCurMonthOweFee(queryStatisticsDto);
- data.put("curMonthOweFee",curMonthOweFee);
+ data.put("curMonthOweFee", curMonthOweFee);
datas.add(data);
--
Gitblit v1.8.0