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 | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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
old mode 100644
new mode 100755
index bbbaa48..5735f16
--- 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
@@ -197,6 +197,8 @@
String[] feePrintRemarks = null;
if (feePrint != null) {
feePrintRemarks = feePrint.getString("content").toLowerCase().replace("</br>", "").split("\n");
+ } else {
+ feePrintRemarks = new String[]{""};
}
int defaultRowHeight = 280;
//璁＄畻褰撳墠鍗曞瓙鐨勯珮搴�
@@ -242,7 +244,11 @@
Row row = sheet.createRow(0 + line);
Cell cell0 = row.createCell(0);
//cell0.setCellValue("缂磋垂閫氱煡鍗晅otalHeight:" + totalHeight + "-totalPageHeight:" + totalPageHeight + "-curPageHeight:" + curPageHeight + "-freePageHeight:" + freePageHeight + "-line:" + line);
- cell0.setCellValue("缂磋垂閫氱煡鍗�");
+ if (feePrint != null) {
+ cell0.setCellValue(feePrint.getString("printName") + "缂磋垂閫氱煡鍗�");
+ } else {
+ cell0.setCellValue("缂磋垂閫氱煡鍗�");
+ }
//鏍囬璁剧疆瀛椾綋
Font font = workbook.createFont();
font.setFontName("榛戜綋");
@@ -275,14 +281,20 @@
subTitleCellStyle.setAlignment(HorizontalAlignment.CENTER);
subTitleCellStyle.setVerticalAlignment(VerticalAlignment.BOTTOM);
row = sheet.createRow(1 + line);
-
Cell cell1 = row.createCell(1);
- cell1.setCellValue("鎴垮彿锛�" + room.getString("floorNum")
- + "-" + room.getString("unitNum")
- + "-" + room.getString("roomNum"));
+ if (fees != null && fees.size() > 0) {
+ cell1.setCellValue("涓氫富锛�" + fees.getJSONObject(0).getString("ownerName"));
+ } else {
+ cell1.setCellValue("涓氫富锛氭棤");
+ }
cell1.setCellStyle(subTitleCellStyle);
- row.createCell(2).setCellValue("");
+ Cell cell2 = row.createCell(2);
+ cell2.setCellValue("鎴垮彿锛�" + room.getString("floorNum")
+ + "-" + room.getString("unitNum")
+ + "-" + room.getString("roomNum"));
+ cell2.setCellStyle(subTitleCellStyle);
+
row.createCell(3).setCellValue("");
row.createCell(4).setCellValue("");
Cell cell5 = row.createCell(5);
@@ -293,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);
@@ -308,7 +320,7 @@
cell1 = row.createCell(1);
cell1.setCellValue("鏀惰垂鏍囧噯");
cell1.setCellStyle(cellStyle);
- Cell cell2 = row.createCell(2);
+ cell2 = row.createCell(2);
cell2.setCellValue("鏁伴噺/闈㈢Н");
cell2.setCellStyle(cellStyle);
Cell cell3 = row.createCell(3);
@@ -345,7 +357,11 @@
cell2.setCellValue(room.getString("builtUpArea"));
cell2.setCellStyle(cellStyle);
cell3 = row.createCell(3);
- cell3.setCellValue(startTime + "鑷�" + endTime);
+ if (feeObj.containsKey("curDegrees")) {
+ cell3.setCellValue(startTime + "鑷�" + endTime + " " + feeObj.getString("preDegrees") + "鑷�" + feeObj.getString("curDegrees"));
+ } else {
+ cell3.setCellValue(startTime + "鑷�" + endTime);
+ }
cell3.setCellStyle(cellStyle);
cell4 = row.createCell(4);
cell4.setCellValue(feeObj.getString("feePrice"));
--
Gitblit v1.8.0