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/QueryOweDetailStatisticsCmd.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOweDetailStatisticsCmd.java b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOweDetailStatisticsCmd.java
index 812e318..c6098a3 100644
--- a/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOweDetailStatisticsCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/dataReport/QueryOweDetailStatisticsCmd.java
@@ -6,13 +6,12 @@
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;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,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;
@@ -165,13 +165,17 @@
}
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);
- tmpInfos.add(BeanConvertUtil.beanCovertMap(info));
+ //todo 娣辨嫹璐�
+ dInfo = new HashMap();
+ dInfo.putAll(info);
+ tmpInfos.add(dInfo);
//璁＄畻鍗曢」 娆犺垂閲戦
computeOweAmount(tmpInfos, info.get("feeTypeCd").toString(), nInfo);
nInfo.put(info.get("feeTypeCd").toString(), tmpInfos);
--
Gitblit v1.8.0