From f4f6ae0c036abb09dd7afbd463340adc81c8f22d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 06 二月 2024 21:51:33 +0800
Subject: [PATCH] 优化报表进度问题
---
service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailRoomCmd.java | 92 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 2 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailRoomCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailRoomCmd.java
index 821ed37..7f0cb77 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailRoomCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeDetailRoomCmd.java
@@ -1,19 +1,29 @@
package com.java110.report.cmd.reportFeeMonthStatistics;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.room.RoomDto;
import com.java110.dto.report.QueryStatisticsDto;
-import com.java110.intf.community.IRoomV1InnerServiceSMO;
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.ListUtil;
+import com.java110.utils.util.MoneyUtil;
+import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import java.math.BigDecimal;
import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
/**
* 鏌ヨ鎴垮眿璐圭敤鏄庣粏琛�
@@ -28,6 +38,7 @@
@Autowired
private IBaseDataStatistics baseDataStatisticsImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -50,7 +61,84 @@
queryStatisticsDto.setFeeTypeCd(reqJson.getString("feeTypeCd"));
queryStatisticsDto.setOwnerName(reqJson.getString("ownerName"));
queryStatisticsDto.setLink(reqJson.getString("link"));
- baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
+ queryStatisticsDto.setPage(reqJson.getInteger("page"));
+ queryStatisticsDto.setRow(reqJson.getInteger("row"));
+ long count = baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
+ List<RoomDto> rooms = null;
+ if (count > 0) {
+ rooms = baseDataStatisticsImpl.getRoomInfo(queryStatisticsDto);
+ } else {
+ rooms = new ArrayList<>();
+ }
+ // todo 璁＄畻 鎴垮眿娆犺垂瀹炴敹鏁版嵁
+ JSONArray datas = computeRoomOweReceivedFee(rooms, queryStatisticsDto);
+
+ ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) queryStatisticsDto.getRow()), count, datas);
+
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ context.setResponseEntity(responseEntity);
+
+ }
+
+ /**
+ * 璁＄畻鎴垮眿娆犺垂 瀹炴敹璐圭敤
+ *
+ * @param rooms
+ * @return
+ */
+ private JSONArray computeRoomOweReceivedFee(List<RoomDto> rooms, QueryStatisticsDto queryStatisticsDto) {
+ if (ListUtil.isNull(rooms)) {
+ return new JSONArray();
+ }
+
+ JSONArray datas = new JSONArray();
+ JSONObject data = null;
+
+ List<String> objIds = new ArrayList<>();
+ 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());
+ datas.add(data);
+ }
+
+ queryStatisticsDto.setObjIds(objIds.toArray(new String[objIds.size()]));
+ List<Map> infos = feeStatisticsImpl.getObjFeeSummary(queryStatisticsDto);
+
+ if (infos == null || infos.size() < 1) {
+ return datas;
+ }
+
+ BigDecimal oweFee = null;
+ BigDecimal receivedFee = null;
+ double oweFeeD = 0;
+ double receivedFeeD = 0;
+ for (int dataIndex = 0; dataIndex < datas.size(); dataIndex++) {
+ oweFee = new BigDecimal(0.00);
+ receivedFee = new BigDecimal(0.00);
+ data = datas.getJSONObject(dataIndex);
+ for (Map info : infos) {
+ if (!data.get("roomId").toString().equals(info.get("objId"))) {
+ continue;
+ }
+
+ oweFeeD = Double.parseDouble(info.get("oweFee").toString());
+ receivedFeeD = Double.parseDouble(info.get("receivedFee").toString());
+
+ oweFee = oweFee.add(new BigDecimal(oweFeeD + ""));
+ receivedFee = receivedFee.add(new BigDecimal(receivedFeeD + ""));
+ data.put("oweFee" + info.get("feeTypeCd").toString(), MoneyUtil.computePriceScale(oweFeeD));
+ data.put("receivedFee" + info.get("feeTypeCd").toString(), MoneyUtil.computePriceScale(receivedFeeD));
+ }
+ data.put("oweFee", MoneyUtil.computePriceScale(oweFee.doubleValue()));
+ data.put("receivedFee", MoneyUtil.computePriceScale(receivedFee.doubleValue()));
+ }
+
+ return datas;
}
}
--
Gitblit v1.8.0