From ceb59d12ab4e142a66e066e1797ec758bb58bb0b Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期三, 06 七月 2022 11:05:54 +0800
Subject: [PATCH] 1、优化费用向添加bug2、优化缴费显示bug
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 113 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 84 insertions(+), 29 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
index f11296b..86160f3 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
@@ -1194,6 +1194,7 @@
String apiUrl = "";
ResponseEntity<String> responseEntity = null;
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
+ reqJson.put("store-id", result.getStoreId());
reqJson.put("page", 1);
reqJson.put("row", 10000);
apiUrl = "/reportQuestionAnswer/queryUserQuestionAnswerValue" + mapToUrlParam(reqJson);
@@ -1529,7 +1530,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = "reportFeeMonthStatistics/queryPayFeeDeposit" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics/queryPayFeeDeposit" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1610,8 +1611,15 @@
row.createCell(4).setCellValue("璐圭敤椤�");
row.createCell(5).setCellValue("璐圭敤寮�濮嬫椂闂�");
row.createCell(6).setCellValue("璐圭敤缁撴潫鏃堕棿");
- row.createCell(7).setCellValue("搴旀敹閲戦");
- row.createCell(8).setCellValue("瀹炴敹閲戦");
+ row.createCell(7).setCellValue("鍘嗗彶娆犺垂(鍗曚綅:鍏�)");
+ row.createCell(8).setCellValue("褰撴湀搴旀敹(鍗曚綅:鍏�)");
+ row.createCell(9).setCellValue("搴旀敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(10).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
+ row.createCell(11).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
+ row.createCell(12).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
+ row.createCell(13).setCellValue("瀹炴敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(14).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
+ row.createCell(15).setCellValue("鏇存柊鏃堕棿");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFeeDetail(pd, result);
if (rooms == null || rooms.size() == 0) {
@@ -1628,8 +1636,20 @@
row.createCell(4).setCellValue(dataObj.getString("feeName"));
row.createCell(5).setCellValue(dataObj.getString("feeCreateTime"));
row.createCell(6).setCellValue(dataObj.getString("deadlineTime"));
- row.createCell(7).setCellValue(dataObj.getString("receivableAmount"));
- row.createCell(8).setCellValue(dataObj.getString("receivedAmount"));
+ row.createCell(7).setCellValue(dataObj.getString("hisOweAmount"));
+ row.createCell(8).setCellValue(dataObj.getString("curReceivableAmount"));
+ BigDecimal hisOweAmount = new BigDecimal(dataObj.getString("hisOweAmount"));
+ BigDecimal curReceivableAmount = new BigDecimal(dataObj.getString("curReceivableAmount"));
+ row.createCell(9).setCellValue(hisOweAmount.add(curReceivableAmount).toString());
+ row.createCell(10).setCellValue(dataObj.getString("curReceivedAmount"));
+ row.createCell(11).setCellValue(dataObj.getString("hisOweReceivedAmount"));
+ row.createCell(12).setCellValue(dataObj.getString("preReceivedAmount"));
+ BigDecimal curReceivedAmount = new BigDecimal(dataObj.getString("curReceivedAmount"));
+ BigDecimal hisOweReceivedAmount = new BigDecimal(dataObj.getString("hisOweReceivedAmount"));
+ BigDecimal preReceivedAmount = new BigDecimal(dataObj.getString("preReceivedAmount"));
+ row.createCell(13).setCellValue(hisOweReceivedAmount.add(preReceivedAmount).add(curReceivedAmount).toString());
+ row.createCell(14).setCellValue(hisOweAmount.add(curReceivableAmount).subtract(curReceivedAmount).subtract(hisOweReceivedAmount).toString());
+ row.createCell(15).setCellValue(dataObj.getString("updateTime"));
}
}
@@ -1687,10 +1707,13 @@
row.createCell(2).setCellValue("璐圭敤椤�");
row.createCell(3).setCellValue("鍘嗗彶娆犺垂(鍗曚綅:鍏�)");
row.createCell(4).setCellValue("褰撴湀搴旀敹(鍗曚綅:鍏�)");
- row.createCell(5).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
- row.createCell(6).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
- row.createCell(7).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
- row.createCell(8).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
+ row.createCell(5).setCellValue("搴旀敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(6).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
+ row.createCell(7).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
+ row.createCell(8).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
+ row.createCell(9).setCellValue("瀹炴敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(10).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
+ row.createCell(11).setCellValue("鏇存柊鏃堕棿");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFeeBreakdown(pd, result);
if (rooms == null || rooms.size() == 0) {
@@ -1706,14 +1729,22 @@
row.createCell(2).setCellValue(dataObj.getString("feeName"));
row.createCell(3).setCellValue(dataObj.getString("hisOweAmount"));
row.createCell(4).setCellValue(dataObj.getString("curReceivableAmount"));
- row.createCell(5).setCellValue(dataObj.getString("curReceivedAmount"));
- row.createCell(6).setCellValue(dataObj.getString("hisOweReceivedAmount"));
- row.createCell(7).setCellValue(dataObj.getString("preReceivedAmount"));
+ BigDecimal hisOweAmount = new BigDecimal(dataObj.getString("hisOweAmount"));
+ BigDecimal curReceivableAmount = new BigDecimal(dataObj.getString("curReceivableAmount"));
+ row.createCell(5).setCellValue(hisOweAmount.add(curReceivableAmount).toString());
+ row.createCell(6).setCellValue(dataObj.getString("curReceivedAmount"));
+ row.createCell(7).setCellValue(dataObj.getString("hisOweReceivedAmount"));
+ row.createCell(8).setCellValue(dataObj.getString("preReceivedAmount"));
+ BigDecimal curReceivedAmount = new BigDecimal(dataObj.getString("curReceivedAmount"));
+ BigDecimal hisOweReceivedAmount = new BigDecimal(dataObj.getString("hisOweReceivedAmount"));
+ BigDecimal preReceivedAmount = new BigDecimal(dataObj.getString("preReceivedAmount"));
+ row.createCell(9).setCellValue(hisOweReceivedAmount.add(preReceivedAmount).add(curReceivedAmount).toString());
oweFeeDec = new BigDecimal(Double.parseDouble(dataObj.getString("hisOweAmount")))
.add(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivableAmount"))))
.subtract(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivedAmount"))))
.subtract(new BigDecimal(Double.parseDouble(dataObj.getString("hisOweReceivedAmount")))).setScale(2, BigDecimal.ROUND_HALF_UP);
- row.createCell(8).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
+ row.createCell(10).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
+ row.createCell(11).setCellValue(dataObj.getString("updateTime"));
}
}
@@ -1748,10 +1779,13 @@
row.createCell(2).setCellValue("鍗曞厓");
row.createCell(3).setCellValue("鍘嗗彶娆犺垂(鍗曚綅:鍏�)");
row.createCell(4).setCellValue("褰撴湀搴旀敹(鍗曚綅:鍏�)");
- row.createCell(5).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
- row.createCell(6).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
- row.createCell(7).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
- row.createCell(8).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
+ row.createCell(5).setCellValue("搴旀敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(6).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
+ row.createCell(7).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
+ row.createCell(8).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
+ row.createCell(9).setCellValue("瀹炴敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(10).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
+ row.createCell(11).setCellValue("鏇存柊鏃堕棿");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFloorUnitFeeSummary(pd, result);
if (rooms == null || rooms.size() == 0) {
@@ -1767,14 +1801,22 @@
row.createCell(2).setCellValue(dataObj.getString("unitNum") + "鍗曞厓");
row.createCell(3).setCellValue(dataObj.getString("hisOweAmount"));
row.createCell(4).setCellValue(dataObj.getString("curReceivableAmount"));
- row.createCell(5).setCellValue(dataObj.getString("curReceivedAmount"));
- row.createCell(6).setCellValue(dataObj.getString("hisOweReceivedAmount"));
- row.createCell(7).setCellValue(dataObj.getString("preReceivedAmount"));
+ BigDecimal hisOweAmount = new BigDecimal(dataObj.getString("hisOweAmount"));
+ BigDecimal curReceivableAmount = new BigDecimal(dataObj.getString("curReceivableAmount"));
+ row.createCell(5).setCellValue(hisOweAmount.add(curReceivableAmount).toString());
+ row.createCell(6).setCellValue(dataObj.getString("curReceivedAmount"));
+ row.createCell(7).setCellValue(dataObj.getString("hisOweReceivedAmount"));
+ row.createCell(8).setCellValue(dataObj.getString("preReceivedAmount"));
+ BigDecimal hisOweReceivedAmount = new BigDecimal(dataObj.getString("hisOweReceivedAmount"));
+ BigDecimal preReceivedAmount = new BigDecimal(dataObj.getString("preReceivedAmount"));
+ BigDecimal curReceivedAmount = new BigDecimal(dataObj.getString("curReceivedAmount"));
+ row.createCell(9).setCellValue(hisOweReceivedAmount.add(preReceivedAmount).add(curReceivedAmount).toString());
oweFeeDec = new BigDecimal(Double.parseDouble(dataObj.getString("hisOweAmount")))
.add(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivableAmount"))))
.subtract(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivedAmount"))))
.subtract(new BigDecimal(Double.parseDouble(dataObj.getString("hisOweReceivedAmount")))).setScale(2, BigDecimal.ROUND_HALF_UP);
- row.createCell(8).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
+ row.createCell(10).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
+ row.createCell(11).setCellValue(dataObj.getString("updateTime"));
}
}
@@ -1844,10 +1886,14 @@
row.createCell(0).setCellValue("鏃ユ湡");
row.createCell(1).setCellValue("鍘嗗彶娆犺垂(鍗曚綅:鍏�)");
row.createCell(2).setCellValue("褰撴湀搴旀敹(鍗曚綅:鍏�)");
- row.createCell(3).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
- row.createCell(4).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
- row.createCell(5).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
- row.createCell(6).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
+ row.createCell(3).setCellValue("搴旀敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(4).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
+ row.createCell(5).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
+ row.createCell(6).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
+ row.createCell(7).setCellValue("瀹炴敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(8).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
+ row.createCell(9).setCellValue("鏀惰垂鐜�");
+ row.createCell(10).setCellValue("鏇存柊鏃堕棿");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFeeSummaryFee(pd, componentValidateResult);
if (rooms == null || rooms.size() == 0) {
@@ -1861,14 +1907,23 @@
row.createCell(0).setCellValue(dataObj.getString("feeYear") + "骞�" + dataObj.getString("feeMonth") + "鏈�");
row.createCell(1).setCellValue(dataObj.getString("hisOweAmount"));
row.createCell(2).setCellValue(dataObj.getString("curReceivableAmount"));
- row.createCell(3).setCellValue(dataObj.getString("curReceivedAmount"));
- row.createCell(4).setCellValue(dataObj.getString("hisOweReceivedAmount"));
- row.createCell(5).setCellValue(dataObj.getString("preReceivedAmount"));
+ BigDecimal hisOweAmount = new BigDecimal(dataObj.getString("hisOweAmount"));
+ BigDecimal curReceivableAmount = new BigDecimal(dataObj.getString("curReceivableAmount"));
+ row.createCell(3).setCellValue(hisOweAmount.add(curReceivableAmount).toString());
+ row.createCell(4).setCellValue(dataObj.getString("curReceivedAmount"));
+ row.createCell(5).setCellValue(dataObj.getString("hisOweReceivedAmount"));
+ row.createCell(6).setCellValue(dataObj.getString("preReceivedAmount"));
+ BigDecimal curReceivedAmount = new BigDecimal(dataObj.getString("curReceivedAmount"));
+ BigDecimal hisOweReceivedAmount = new BigDecimal(dataObj.getString("hisOweReceivedAmount"));
+ BigDecimal preReceivedAmount = new BigDecimal(dataObj.getString("preReceivedAmount"));
+ row.createCell(7).setCellValue(curReceivedAmount.add(hisOweReceivedAmount).add(preReceivedAmount).toString());
oweFeeDec = new BigDecimal(Double.parseDouble(dataObj.getString("hisOweAmount")))
.add(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivableAmount"))))
.subtract(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivedAmount"))))
.subtract(new BigDecimal(Double.parseDouble(dataObj.getString("hisOweReceivedAmount")))).setScale(2, BigDecimal.ROUND_HALF_UP);
- row.createCell(6).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
+ row.createCell(8).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
+ row.createCell(9).setCellValue(dataObj.getString("chargeRate"));
+ row.createCell(10).setCellValue(dataObj.getString("updateTime"));
}
}
--
Gitblit v1.8.0