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 | 180 +++++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 129 insertions(+), 51 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 6cc64e4..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
@@ -1,23 +1,26 @@
package com.java110.report.cmd.dataReport;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
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;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
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.Calendar;
import java.util.List;
-import java.util.Map;
/**
* 鏌ヨ鏀惰垂鎯呭喌鍒嗘瀽
@@ -28,6 +31,12 @@
@Autowired
private IFeeStatistics feeStatisticsImpl;
+
+ @Autowired
+ private IFloorV1InnerServiceSMO floorV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IBaseDataStatistics baseDataStatisticsImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -48,63 +57,132 @@
@Override
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
+
+ String[] floorIds = reqJson.getString("floorIds").split(",");
+ //todo 濡傛灉娌℃湁鍖呭惈妤兼爧淇℃伅 鐩存帴杩斿洖绌�
+ if (floorIds == null || floorIds.length < 1) {
+ return;
+ }
+ JSONArray data = new JSONArray();
+ //todo 鏍规嵁妤兼爧ID寰幆鏌ヨ
+ for (String floorId : floorIds) {
+ //todo 鑾峰彇鍒版暟鎹�
+ doGetData(floorId, data, reqJson);
+ }
+ context.setResponseEntity(ResultVo.createResponseEntity(data));
+ }
+
+ /**
+ * 鏌ヨ鏁版嵁
+ *
+ * @param floorId
+ * @param datas
+ */
+ 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.setConfigId(reqJson.getString("configId"));
- queryStatisticsDto.setObjName(reqJson.getString("objName"));
queryStatisticsDto.setFeeTypeCd(reqJson.getString("feeTypeCd"));
- queryStatisticsDto.setOwnerName(reqJson.getString("ownerName"));
- List<Map> datas = null;
- // todo 鎸夋ゼ鏍嬭绠楀疄鏀舵儏鍐�
- datas = feeStatisticsImpl.getReceivedFeeByFloor(queryStatisticsDto);
+ 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());
- datas = computeFloorReceivedFee(datas);
+ // 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());
- context.setResponseEntity(ResultVo.createResponseEntity(datas));
+ // todo 鏌ヨ鎴锋暟
+ long roomCount = baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
+ data.put("roomCount", roomCount);
+
+
+
+ // todo 鏌ヨ 鍘嗗彶娆犺垂
+ //杩欓噷璁剧疆鏌ヨ鏈�1鏃� 涓嶇劧鍘嗗彶鍜屾�绘瑺璐逛竴鏍锋湁鐐瑰鎬�
+ queryStatisticsDto.setStartDate(monthFastDate);
+ double hisMonthOweFee = feeStatisticsImpl.getHisMonthOweFee(queryStatisticsDto);
+ data.put("hisMonthOweFee", hisMonthOweFee);
+
+ // todo 鏌ヨ鎬绘瑺璐�
+ queryStatisticsDto.setEndDate(monthLastDate);
+ double oweFee = feeStatisticsImpl.getOweFee(queryStatisticsDto);
+ data.put("oweFee", oweFee);
+
+ // todo 鏈棩宸蹭氦鎴锋暟
+ queryStatisticsDto.setStartDate(startDate);
+ queryStatisticsDto.setEndDate(endDate);
+ double todayReceivedRoomCount = feeStatisticsImpl.getReceivedRoomCount(queryStatisticsDto);
+ data.put("todayReceivedRoomCount", todayReceivedRoomCount);
+
+ // todo 鏈棩宸蹭氦閲戦
+ double todayReceivedRoomAmount = feeStatisticsImpl.getReceivedRoomAmount(queryStatisticsDto);
+ 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(monthFastDate);
+ queryStatisticsDto.setEndDate(monthLastDate);
+ double monthReceivedRoomCount = feeStatisticsImpl.getMonthReceivedDetailCount(queryStatisticsDto);
+ data.put("monthReceivedRoomCount", monthReceivedRoomCount);
+
+ // 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);
+
+
}
- private List<Map> computeFloorReceivedFee(List<Map> datas) {
- if (datas == null || datas.size() < 1) {
- return new ArrayList<>();
- }
-
- List<Map> tmpDatas = new ArrayList<>();
- for (Map data : datas) {
- if (!hasInTmp(tmpDatas, data)) {
- tmpDatas.add(data);
- }
- }
-
- if (tmpDatas == null || tmpDatas.size() < 1) {
- return new ArrayList<>();
- }
-
- BigDecimal receivedFee = new BigDecimal(0.00);
- for (Map tmpData : tmpDatas) {
- for (Map data : datas) {
- if (!data.get("floorId").toString().equals(tmpData.get("floorId"))) {
- continue;
- }
-
- receivedFee = receivedFee.add(new BigDecimal(data.get("receivedFee").toString()));
- tmpData.put("receivedFee" + data.get("feeTypeCd").toString(), data.get("receivedFee"));
- }
- tmpData.put("receivedFee", receivedFee.doubleValue());
- }
-
- return tmpDatas;
- }
-
- private boolean hasInTmp(List<Map> tmpDatas, Map data) {
- for (Map tmpData : tmpDatas) {
- if (tmpData.get("floorId").equals(data.get("floorId"))) {
- return true;
- }
- }
- return false;
- }
}
--
Gitblit v1.8.0