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/QueryOweDetailStatisticsCmd.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 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 bdfca1e..9085714 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,8 +6,10 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.dict.DictDto;
import com.java110.dto.room.RoomDto;
import com.java110.dto.report.QueryStatisticsDto;
+import com.java110.intf.dev.IDictV1InnerServiceSMO;
import com.java110.report.statistics.IBaseDataStatistics;
import com.java110.report.statistics.IFeeStatistics;
import com.java110.utils.exception.CmdException;
@@ -36,6 +38,9 @@
@Autowired
private IBaseDataStatistics baseDataStatisticsImpl;
+
+ @Autowired
+ private IDictV1InnerServiceSMO dictV1InnerServiceSMOImpl;
@Override
@@ -69,10 +74,10 @@
queryStatisticsDto.setRow(reqJson.getInteger("row"));
//todo 鏌ヨ鎴垮眿淇℃伅
- long count = baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
+ long count = baseDataStatisticsImpl.getOweRoomCount(queryStatisticsDto);
List<RoomDto> rooms = null;
if (count > 0) {
- rooms = baseDataStatisticsImpl.getRoomInfo(queryStatisticsDto);
+ rooms = baseDataStatisticsImpl.getOweRoomInfo(queryStatisticsDto);
} else {
rooms = new ArrayList<>();
}
@@ -131,6 +136,11 @@
List<Map> itemFees = null;
String feeTypeCd = "";
+ DictDto dictDto = new DictDto();
+ dictDto.setTableName("pay_fee_config");
+ dictDto.setTableColumns("fee_type_cd_show");
+ List<DictDto> dictDtos = dictV1InnerServiceSMOImpl.queryDicts(dictDto);
+
// todo 鏍规嵁鎴垮眿ID 鍜宲ayerObjId 姣旇緝 鍚堝苟鏁版嵁锛岃璐圭敤澶х被 妯悜 鏀惧叆 data涓紝
// todo 骞朵笖璁＄畻姣忎釜 鎴垮眿 璐圭敤澶х被鐨勬瑺璐� 鍜屾埧灞嬬殑鎬绘瑺璐�
for (int dataIndex = 0; dataIndex < datas.size(); dataIndex++) {
@@ -141,9 +151,18 @@
if (!data.getString("roomId").equals(info.get("payerObjId"))) {
continue;
}
- feeTypeCd = info.get("feeTypeCd").toString();
- oweFee = oweFee.add(new BigDecimal(info.get(feeTypeCd + "oweFee").toString()));
- data.put("oweFee" + feeTypeCd, info.get(feeTypeCd));
+// if(!info.containsKey("feeTypeCd")){
+// continue;
+// }
+ for (DictDto tDict : dictDtos) {
+ //feeTypeCd = info.get("feeTypeCd").toString();
+ feeTypeCd = tDict.getStatusCd();
+ if (!info.containsKey(feeTypeCd)) {
+ continue;
+ }
+ oweFee = oweFee.add(new BigDecimal(info.get(feeTypeCd + "oweFee").toString()));
+ data.put("oweFee" + feeTypeCd, info.get(feeTypeCd));
+ }
}
data.put("oweFee", oweFee.doubleValue());
}
--
Gitblit v1.8.0