From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 080588d..5735f16 100755
--- 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
@@ -281,11 +281,13 @@
subTitleCellStyle.setAlignment(HorizontalAlignment.CENTER);
subTitleCellStyle.setVerticalAlignment(VerticalAlignment.BOTTOM);
row = sheet.createRow(1 + line);
+ Cell cell1 = row.createCell(1);
if (fees != null && fees.size() > 0) {
- row.createCell(1).setCellValue("涓氫富锛�" + fees.getJSONObject(0).getString("ownerName"));
+ cell1.setCellValue("涓氫富锛�" + fees.getJSONObject(0).getString("ownerName"));
} else {
- row.createCell(1).setCellValue("涓氫富锛氭棤");
+ cell1.setCellValue("涓氫富锛氭棤");
}
+ cell1.setCellStyle(subTitleCellStyle);
Cell cell2 = row.createCell(2);
cell2.setCellValue("鎴垮彿锛�" + room.getString("floorNum")
@@ -303,7 +305,7 @@
row.setRowStyle(rowCellStyle);
//璁剧疆琛ㄥご涔嬩笂
- region = new CellRangeAddress(1 + line, 1 + line, 1, 3);
+ region = new CellRangeAddress(1 + line, 1 + line, 2, 3);
sheet.addMergedRegion(region);
region = new CellRangeAddress(1 + line, 1 + line, 5, 6);
sheet.addMergedRegion(region);
@@ -315,7 +317,7 @@
cell0 = row.createCell(0);
cell0.setCellValue("鏀惰垂鍚嶇О");
cell0.setCellStyle(cellStyle);
- Cell cell1 = row.createCell(1);
+ cell1 = row.createCell(1);
cell1.setCellValue("鏀惰垂鏍囧噯");
cell1.setCellStyle(cellStyle);
cell2 = row.createCell(2);
--
Gitblit v1.8.0