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/QueryReceivedDetailStatisticsCmd.java | 121 +++++++++++++++++++++++++++++++++++++---
1 files changed, 112 insertions(+), 9 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryReceivedDetailStatisticsCmd.java b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryReceivedDetailStatisticsCmd.java
index 975e2a3..87f3948 100644
--- a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryReceivedDetailStatisticsCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryReceivedDetailStatisticsCmd.java
@@ -6,7 +6,7 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.RoomDto;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.report.QueryStatisticsDto;
import com.java110.report.statistics.IBaseDataStatistics;
import com.java110.report.statistics.IFeeStatistics;
@@ -21,6 +21,7 @@
import java.math.BigDecimal;
import java.text.ParseException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -110,26 +111,128 @@
}
queryStatisticsDto.setObjIds(objIds.toArray(new String[objIds.size()]));
- List<Map> infos = feeStatisticsImpl.getObjFeeSummary(queryStatisticsDto);
+ List<Map> infos = feeStatisticsImpl.getObjReceivedFee(queryStatisticsDto);
- if(infos == null || infos.size() < 1){
+
+ if (infos == null || infos.size() < 1) {
return datas;
}
+ //todo 娓呮礂鏁版嵁 灏嗘暟鎹浆鍙樻垚 map roomId feeTypeCd->array
+ // todo 璁� payerObjId, feeTypeCd,feeName,endTime,deadlineTime,amountOwed 杞崲涓� 鎸塸ayerObjId 绾靛悜杞崲
+ // todo nInfo.put(info.get("payerObjId").toString(), info.get("payerObjId").toString());
+ // todo nInfo.put(info.get("feeTypeCd").toString(), tmpInfos);
+ infos = washInfos(infos);
+
BigDecimal receivedFee = new BigDecimal(0.00);
- for(int dataIndex = 0; dataIndex < datas.size();dataIndex ++){
+ List<Map> itemFees = null;
+ String feeTypeCd = "";
+ data.put("receivedFee", "0");
+
+ // todo 鏍规嵁鎴垮眿ID 鍜宲ayerObjId 姣旇緝 鍚堝苟鏁版嵁锛岃璐圭敤澶х被 妯悜 鏀惧叆 data涓紝
+ // todo 骞朵笖璁＄畻姣忎釜 鎴垮眿 璐圭敤澶х被鐨勬瑺璐� 鍜屾埧灞嬬殑鎬绘瑺璐�
+ for (int dataIndex = 0; dataIndex < datas.size(); dataIndex++) {
data = datas.getJSONObject(dataIndex);
- for(Map info : infos){
- if(!data.get("roomId").toString().equals(info.get("objId"))){
+ //todo 杩欓噷寰幆璐圭敤澶х被
+ for (Map info : infos) {
+ if (!data.getString("roomId").equals(info.get("payerObjId"))) {
continue;
}
- receivedFee = receivedFee.add(new BigDecimal(info.get("receivedFee").toString()));
- data.put("receivedFee"+info.get("feeTypeCd").toString(),info.get("receivedFee"));
+ feeTypeCd = info.get("feeTypeCd").toString();
+ receivedFee = receivedFee.add(new BigDecimal(info.get(feeTypeCd + "receivedFee").toString()));
+ data.put("receivedFee" + feeTypeCd, info.get(feeTypeCd));
}
- data.put("receivedFee",receivedFee.doubleValue());
+ data.put("receivedFee", receivedFee.doubleValue());
}
return datas;
}
+ /**
+ * //todo 娓呮礂鏁版嵁 灏嗘暟鎹浆鍙樻垚 map roomId feeTypeCd->array
+ * // todo 璁� payerObjId, feeTypeCd,feeName,endTime,deadlineTime,amountOwed 杞崲涓� 鎸塸ayerObjId 绾靛悜杞崲
+ * // todo nInfo.put(info.get("feeTypeCd").toString(), tmpInfos);
+ *
+ * @param infos
+ * @return
+ */
+ private List<Map> washInfos(List<Map> infos) {
+ List<Map> newInfos = new ArrayList<>();
+ for (Map info : infos) {
+ generatorNewInfo(newInfos, info);
+ }
+
+ List<Map> tmpInfos = null;
+ Map dInfo = null;
+ for (Map nInfo : newInfos) {
+ for (Map info : infos) {
+ if (!nInfo.get("payerObjId").equals(info.get("payerObjId"))) {
+ continue;
+ }
+ tmpInfos = getTmpInfos(nInfo, info);
+ //todo 娣辨嫹璐�
+ dInfo = new HashMap();
+ dInfo.putAll(info);
+ tmpInfos.add(dInfo);
+ //璁＄畻鍗曢」 娆犺垂閲戦
+ computeReceivedAmount(tmpInfos, info.get("feeTypeCd").toString(), nInfo);
+ nInfo.put(info.get("feeTypeCd").toString(), tmpInfos);
+ }
+ }
+
+ return newInfos;
+
+ }
+
+ /**
+ * 璁＄畻姣忎釜璐圭敤澶х被鐨� 娆犺垂
+ *
+ * @param tmpInfos
+ * @param feeTypeCd
+ * @param nInfo
+ */
+ private void computeReceivedAmount(List<Map> tmpInfos, String feeTypeCd, Map nInfo) {
+ if (tmpInfos == null || tmpInfos.size() < 1) {
+ nInfo.put(feeTypeCd + "receivedFee", 0.0);
+ return;
+ }
+ BigDecimal receivedAmount = new BigDecimal(0.0);
+ for (Map tInfo : tmpInfos) {
+ receivedAmount = receivedAmount.add(new BigDecimal(tInfo.get("receivedAmount").toString()));
+ }
+ receivedAmount = receivedAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
+ nInfo.put(feeTypeCd + "receivedFee", receivedAmount.doubleValue());
+ }
+
+ private List<Map> getTmpInfos(Map nInfo, Map info) {
+ String feeTypeCd = info.get("feeTypeCd").toString();
+ if (nInfo.containsKey(feeTypeCd)) {
+ return (List<Map>) nInfo.get(feeTypeCd);
+ }
+
+ return new ArrayList<>();
+ }
+
+ /**
+ * 鏌ヨ 鏂版暟鎹鏂�
+ *
+ * @param newInfos
+ * @param info
+ * @return
+ */
+ private void generatorNewInfo(List<Map> newInfos, Map info) {
+ if (newInfos.size() < 1) {
+ newInfos.add(info);
+ return;
+ }
+
+ for (Map newInfo : newInfos) {
+ if (newInfo.get("payerObjId").equals(info.get("payerObjId"))) {
+ return;
+ }
+ }
+
+ newInfos.add(info);
+ }
+
}
--
Gitblit v1.8.0