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/QueryReceivedDetailStatisticsCmd.java | 161 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 142 insertions(+), 19 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..be3d448 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,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.RoomDto;
+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;
@@ -21,6 +23,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;
@@ -36,6 +39,8 @@
@Autowired
private IBaseDataStatistics baseDataStatisticsImpl;
+ @Autowired
+ private IDictV1InnerServiceSMO dictV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -66,16 +71,16 @@
queryStatisticsDto.setLink(reqJson.getString("link"));
queryStatisticsDto.setPage(reqJson.getInteger("page"));
queryStatisticsDto.setRow(reqJson.getInteger("row"));
- long count = baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
+ long count = baseDataStatisticsImpl.getReceivedRoomCount(queryStatisticsDto);
List<RoomDto> rooms = null;
if (count > 0) {
- rooms = baseDataStatisticsImpl.getRoomInfo(queryStatisticsDto);
+ rooms = baseDataStatisticsImpl.getReceivedRoomInfo(queryStatisticsDto);
} else {
rooms = new ArrayList<>();
}
// todo 璁＄畻 鎴垮眿娆犺垂瀹炴敹鏁版嵁
- JSONArray datas = computeRoomOweReceivedFee(rooms,queryStatisticsDto);
+ JSONArray datas = computeRoomOweReceivedFee(rooms, queryStatisticsDto);
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) queryStatisticsDto.getRow()), count, datas);
@@ -89,7 +94,7 @@
* @param rooms
* @return
*/
- private JSONArray computeRoomOweReceivedFee(List<RoomDto> rooms,QueryStatisticsDto queryStatisticsDto) {
+ private JSONArray computeRoomOweReceivedFee(List<RoomDto> rooms, QueryStatisticsDto queryStatisticsDto) {
if (rooms == null || rooms.size() < 1) {
return new JSONArray();
}
@@ -101,35 +106,153 @@
for (RoomDto roomDto : rooms) {
objIds.add(roomDto.getRoomId());
data = new JSONObject();
- data.put("roomId",roomDto.getRoomId());
- data.put("roomName",roomDto.getFloorNum()+"-"+roomDto.getUnitNum()+"-"+roomDto.getRoomNum());
- data.put("ownerName",roomDto.getOwnerName());
- data.put("ownerId",roomDto.getOwnerId());
- data.put("link",roomDto.getLink());
+ data.put("roomId", roomDto.getRoomId());
+ data.put("roomName", roomDto.getFloorNum() + "-" + roomDto.getUnitNum() + "-" + roomDto.getRoomNum());
+ data.put("ownerName", roomDto.getOwnerName());
+ data.put("ownerId", roomDto.getOwnerId());
+ data.put("link", roomDto.getLink());
datas.add(data);
}
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;
}
- BigDecimal receivedFee = new BigDecimal(0.00);
- for(int dataIndex = 0; dataIndex < datas.size();dataIndex ++){
+ //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);
+
+ //System.out.printf("infos = " + JSONObject.toJSONString(infos));
+
+ BigDecimal receivedFee = null;
+ List<Map> itemFees = null;
+ String feeTypeCd = "";
+ data.put("receivedFee", "0");
+
+ 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++) {
+ receivedFee = new BigDecimal(0.00);
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"));
+ for (DictDto tDict : dictDtos) {
+ //feeTypeCd = info.get("feeTypeCd").toString();
+ feeTypeCd = tDict.getStatusCd();
+ if (!info.containsKey(feeTypeCd)) {
+ continue;
+ }
+ 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;
+ }
+ //todo 鏍规嵁feeTypeCd 鍘诲鎵�
+ 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