From d8bc08083504bc5d8ba61513ac21ec0f26ba5c8d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 30 十二月 2020 23:51:23 +0800
Subject: [PATCH] 优化代码
---
service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 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 14b8836..32267e7 100644
--- 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
@@ -117,15 +117,20 @@
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(7).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.getReportPayFeeDetail(pd, result);
+
+ if (rooms == null) {
+ return;
+ }
JSONObject dataObj = null;
for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
row = sheet.createRow(roomIndex + 1);
@@ -134,11 +139,12 @@
row.createCell(0).setCellValue(roomIndex + 1);
row.createCell(1).setCellValue(dataObj.getString("objName"));
row.createCell(2).setCellValue(dataObj.getString("feeName"));
- row.createCell(3).setCellValue(dataObj.getString("startTime"));
- row.createCell(4).setCellValue(dataObj.getString("endTime"));
- row.createCell(5).setCellValue(dataObj.getString("createTime"));
- row.createCell(6).setCellValue(dataObj.getString("receivableAmount"));
- row.createCell(7).setCellValue(dataObj.getString("receivedAmount"));
+ 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"));
}
}
@@ -218,7 +224,7 @@
row.createCell(1).setCellValue(dataObj.getString("objName"));
row.createCell(2).setCellValue(dataObj.getString("feeName"));
row.createCell(3).setCellValue(dataObj.getString("feeCreateTime"));
- row.createCell(4).setCellValue("-");
+ row.createCell(4).setCellValue(dataObj.getString("deadlineTime"));
row.createCell(5).setCellValue(dataObj.getString("receivableAmount"));
row.createCell(6).setCellValue(dataObj.getString("receivedAmount"));
@@ -286,9 +292,9 @@
dataObj = rooms.getJSONObject(roomIndex);
row.createCell(0).setCellValue(roomIndex + 1);
- row.createCell(2).setCellValue(dataObj.getString("feeName"));
- row.createCell(3).setCellValue(dataObj.getString("feeCreateTime"));
- row.createCell(1).setCellValue(dataObj.getString("receivableAmount"));
+ row.createCell(1).setCellValue(dataObj.getString("feeName"));
+ row.createCell(2).setCellValue(dataObj.getString("feeCreateTime"));
+ row.createCell(3).setCellValue(dataObj.getString("receivableAmount"));
row.createCell(4).setCellValue(dataObj.getString("receivedAmount"));
row.createCell(5).setCellValue(dataObj.getString("oweAmount"));
@@ -334,11 +340,10 @@
for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
row = sheet.createRow(roomIndex + 1);
dataObj = rooms.getJSONObject(roomIndex);
-
row.createCell(0).setCellValue(dataObj.getString("feeYear") + "骞�" + dataObj.getString("feeMonth") + "鏈�");
- row.createCell(1).setCellValue(dataObj.getString("receivableAmount"));
- row.createCell(2).setCellValue(dataObj.getString("floorNum") + "鍙锋ゼ");
- row.createCell(3).setCellValue(dataObj.getString("unitNum") + "鍗曞厓");
+ row.createCell(1).setCellValue(dataObj.getString("floorNum") + "鍙锋ゼ");
+ row.createCell(2).setCellValue(dataObj.getString("unitNum") + "鍗曞厓");
+ row.createCell(3).setCellValue(dataObj.getString("receivableAmount"));
row.createCell(4).setCellValue(dataObj.getString("receivedAmount"));
row.createCell(5).setCellValue(dataObj.getString("oweAmount"));
--
Gitblit v1.8.0