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 | 9 +++++----
1 files changed, 5 insertions(+), 4 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 b3f2c8a..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;
@@ -124,9 +124,10 @@
// todo nInfo.put(info.get("feeTypeCd").toString(), tmpInfos);
infos = washInfos(infos);
- BigDecimal oweFee = new BigDecimal(0.00);
+ BigDecimal receivedFee = new BigDecimal(0.00);
List<Map> itemFees = null;
String feeTypeCd = "";
+ data.put("receivedFee", "0");
// todo 鏍规嵁鎴垮眿ID 鍜宲ayerObjId 姣旇緝 鍚堝苟鏁版嵁锛岃璐圭敤澶х被 妯悜 鏀惧叆 data涓紝
// todo 骞朵笖璁＄畻姣忎釜 鎴垮眿 璐圭敤澶х被鐨勬瑺璐� 鍜屾埧灞嬬殑鎬绘瑺璐�
@@ -138,10 +139,10 @@
continue;
}
feeTypeCd = info.get("feeTypeCd").toString();
- oweFee = oweFee.add(new BigDecimal(info.get(feeTypeCd + "receivedFee").toString()));
+ receivedFee = receivedFee.add(new BigDecimal(info.get(feeTypeCd + "receivedFee").toString()));
data.put("receivedFee" + feeTypeCd, info.get(feeTypeCd));
}
- data.put("receivedFee", oweFee.doubleValue());
+ data.put("receivedFee", receivedFee.doubleValue());
}
return datas;
--
Gitblit v1.8.0