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/ExportFeeManualCollectionSMOImpl.java |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java
index cd4c594..0d87994 100644
--- a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java
@@ -10,11 +10,7 @@
 import com.java110.utils.constant.ServiceConstant;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.DateUtil;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.CellStyle;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
@@ -141,7 +137,7 @@
         //鏌ヨ妤兼爧淇℃伅
         JSONArray rooms = this.getExistsRoomFee(pd, componentValidateResult);
         if (rooms == null || rooms.size() < 1) {
-            CellRangeAddress region = new CellRangeAddress(0, 0, 0, 6);
+            CellRangeAddress region = new CellRangeAddress(0, 0, 0, 1);
             sheet.addMergedRegion(region);
             return;
         }
@@ -155,6 +151,8 @@
             }
             dataKeyIndex++;
         }
+        row.createCell(dataKeyIndex).setCellValue("澶囨敞");
+
 
         for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
             row = sheet.createRow(roomIndex + 2);
@@ -165,9 +163,16 @@
                 row.createCell(dataKeyIndex).setCellValue(dataObj.getString(key));
                 dataKeyIndex++;
             }
+            row.createCell(dataKeyIndex + 2).setCellValue("");
         }
 
-        CellRangeAddress region = new CellRangeAddress(0, 0, 0, 6);
+        row = sheet.createRow(rooms.size() + 2);
+        cell0 = row.createCell(0);
+        cell0.setCellValue("娉細姝ゃ�婃瑺璐圭粺璁¤〃銆嬩氦鐢卞帵闂ㄧ淮搴︽櫤涓寸鎶�鏈夐檺鍏徃杩涜鍌敹");
+
+        CellRangeAddress region = new CellRangeAddress(0, 0, 0, dataKeyIndex);
+        sheet.addMergedRegion(region);
+        region = new CellRangeAddress(rooms.size() + 2, rooms.size() + 2, 0, dataKeyIndex);
         sheet.addMergedRegion(region);
     }
 

--
Gitblit v1.8.0