From 74be20dfb5b244bbae3387db7a1aecb9fc1a21bd Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期三, 16 六月 2021 18:22:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java
index a2725fb..c97443f 100755
--- a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java
@@ -140,8 +140,11 @@
for (int feeConfigIndex = 0; feeConfigIndex < feeConfigDtos.size(); feeConfigIndex++) {
row.createCell(4 + feeConfigIndex).setCellValue(feeConfigDtos.get(feeConfigIndex).getFeeName());
}
+ row.createCell(4 + feeConfigDtos.size()).setCellValue("鍚堣");
+ } else {
+ row.createCell(4).setCellValue("鍚堣");
}
- row.createCell(4 + feeConfigDtos.size()).setCellValue("鍚堣");
+
JSONObject dataObj = null;
for (int roomIndex = 0; roomIndex < oweFees.size(); roomIndex++) {
@@ -155,8 +158,11 @@
for (int feeConfigIndex = 0; feeConfigIndex < feeConfigDtos.size(); feeConfigIndex++) {
row.createCell(4 + feeConfigIndex).setCellValue(getFeeConfigAmount(feeConfigDtos.get(feeConfigIndex), dataObj));
}
+ row.createCell(4 + feeConfigDtos.size()).setCellValue(getAllFeeOweAmount(feeConfigDtos, dataObj));
+ } else {
+ row.createCell(4).setCellValue(getAllFeeOweAmount(feeConfigDtos, dataObj));
}
- row.createCell(4 + feeConfigDtos.size()).setCellValue(getAllFeeOweAmount(feeConfigDtos, dataObj));
+
}
}
@@ -187,6 +193,10 @@
return dataObj.getDouble("amountOwed");
}
JSONArray items = dataObj.getJSONArray("items");
+ if (items == null || items.size() < 1) {
+ return dataObj.getDouble("amountOwed");
+ }
+
BigDecimal oweAmount = new BigDecimal(0);
for (FeeConfigDto feeConfigDto : feeConfigDtos) {
for (int itemIndex = 0; itemIndex < items.size(); itemIndex++) {
@@ -201,8 +211,12 @@
private double getFeeConfigAmount(FeeConfigDto feeConfigDto, JSONObject dataObj) {
JSONArray items = dataObj.getJSONArray("items");
-
double oweAmount = 0;
+
+ if (items == null || items.size() < 1) {
+ return oweAmount;
+ }
+
for (int itemIndex = 0; itemIndex < items.size(); itemIndex++) {
if (feeConfigDto.getConfigId().equals(items.getJSONObject(itemIndex).getString("configId"))) {
oweAmount = items.getJSONObject(itemIndex).getDouble("amountOwed");
@@ -218,13 +232,13 @@
FeeConfigDto feeConfigDto = null;
for (int oweFeeIndex = 0; oweFeeIndex < oweFees.size(); oweFeeIndex++) {
JSONArray items = oweFees.getJSONObject(oweFeeIndex).getJSONArray("items");
- for(int itemIndex = 0; itemIndex < items.size(); itemIndex++) {
+ for (int itemIndex = 0; itemIndex < items.size(); itemIndex++) {
if (existsFeeConfig(feeConfigDtos, items.getJSONObject(itemIndex))) {
continue;
}
feeConfigDto = new FeeConfigDto();
- feeConfigDto.setConfigId(items.getJSONObject(oweFeeIndex).getString("configId"));
- feeConfigDto.setFeeName(items.getJSONObject(oweFeeIndex).getString("configName"));
+ feeConfigDto.setConfigId(items.getJSONObject(itemIndex).getString("configId"));
+ feeConfigDto.setFeeName(items.getJSONObject(itemIndex).getString("configName"));
feeConfigDtos.add(feeConfigDto);
}
}
@@ -249,7 +263,7 @@
private void reportPayFeeDetail(IPageData pd, ComponentValidateResult result, Workbook workbook) {
Sheet sheet = workbook.createSheet("缂磋垂鏄庣粏琛�");
Row row = sheet.createRow(0);
- row.createCell(0).setCellValue("璐圭敤缂栧彿");
+ row.createCell(0).setCellValue("璁㈠崟鍙�");
row.createCell(1).setCellValue("鎴垮彿");
row.createCell(2).setCellValue("璐圭敤椤�");
row.createCell(3).setCellValue("鏀粯鏂瑰紡");
@@ -263,6 +277,7 @@
row.createCell(11).setCellValue("婊炵撼閲�");
row.createCell(12).setCellValue("绌虹疆鎴挎墦鎶橀噾棰�");
row.createCell(13).setCellValue("绌虹疆鎴垮噺鍏嶉噾棰�");
+ row.createCell(14).setCellValue("涓氫富");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportPayFeeDetail(pd, result);
if (rooms == null) {
@@ -272,20 +287,22 @@
for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
row = sheet.createRow(roomIndex + 1);
dataObj = rooms.getJSONObject(roomIndex);
- row.createCell(0).setCellValue(roomIndex + 1);
+ row.createCell(0).setCellValue(dataObj.getString("oId"));
row.createCell(1).setCellValue(dataObj.getString("objName"));
row.createCell(2).setCellValue(dataObj.getString("feeName"));
row.createCell(3).setCellValue(dataObj.getString("primeRate"));
row.createCell(4).setCellValue(dataObj.getString("startTime"));
row.createCell(5).setCellValue(dataObj.getString("endTime"));
row.createCell(6).setCellValue(dataObj.getString("createTime"));
- row.createCell(7).setCellValue(dataObj.getString("receivableAmount"));
- row.createCell(8).setCellValue(dataObj.getString("receivedAmount"));
- row.createCell(9).setCellValue(dataObj.getString("preferentialAmount"));
- row.createCell(10).setCellValue(dataObj.getString("deductionAmount"));
- row.createCell(11).setCellValue(dataObj.getString("lateFee"));
- row.createCell(12).setCellValue(dataObj.getString("vacantHousingDiscount"));
- row.createCell(13).setCellValue(dataObj.getString("vacantHousingReduction"));
+ row.createCell(7).setCellValue(dataObj.getDouble("receivableAmount"));
+ row.createCell(8).setCellValue(dataObj.getDouble("receivedAmount"));
+ row.createCell(9).setCellValue(dataObj.getDouble("preferentialAmount"));
+ row.createCell(10).setCellValue(dataObj.getDouble("deductionAmount"));
+ row.createCell(11).setCellValue(dataObj.getDouble("lateFee"));
+ row.createCell(12).setCellValue(dataObj.getDouble("vacantHousingDiscount"));
+ row.createCell(13).setCellValue(dataObj.getDouble("vacantHousingReduction"));
+ row.createCell(14).setCellValue(dataObj.getString("ownerName"));
+
}
}
--
Gitblit v1.8.0