From 8d5801f0251ce9bd1ad80a7e7a6cfdcf8e2d111c Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 18 十一月 2021 22:30:17 +0800
Subject: [PATCH] 优化代码
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 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 f45040c..53ad980 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
@@ -1570,26 +1570,35 @@
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("娆犺垂閲戦(鍗曚綅:鍏�)");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFeeBreakdown(pd, result);
if (rooms == null || rooms.size() == 0) {
return;
}
JSONObject dataObj = null;
+ BigDecimal oweFeeDec = null;
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(1).setCellValue(dataObj.getString("feeTypeCd"));
row.createCell(2).setCellValue(dataObj.getString("feeName"));
- row.createCell(3).setCellValue(dataObj.getString("feeCreateTime"));
- row.createCell(4).setCellValue(dataObj.getString("receivableAmount"));
- row.createCell(5).setCellValue(dataObj.getString("receivedAmount"));
- row.createCell(6).setCellValue(dataObj.getString("oweAmount"));
+ 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"));
+ 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() + "");
}
}
--
Gitblit v1.8.0