From 9fd2f9a7b69a26cf1a5aed1d664a0d042e1e864a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 21 十二月 2020 16:44:01 +0800
Subject: [PATCH] 完成富友 支付对接完成

---
 service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 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 4535c79..c5b86ac 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
@@ -222,7 +222,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"));
 
@@ -290,9 +290,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"));
 
@@ -338,11 +338,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