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 | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 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 fe8850f..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
@@ -141,10 +141,12 @@
* @param workbook
*/
private void getRoomOweFees(IPageData pd, ComponentValidateResult result, Workbook workbook) {
-
+ Sheet sheet = workbook.createSheet("鍌即鍗�");
+ Drawing patriarch = sheet.createDrawingPatriarch();
String apiUrl = "";
ResponseEntity<String> responseEntity = null;
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeApi/listAllRoomOweFees?communityId=" + result.getCommunityId();
+ JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/feeApi/listAllRoomOweFees" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
@@ -180,12 +182,11 @@
}
- Sheet sheet = workbook.createSheet("鍌即鍗�");
- Drawing patriarch = sheet.createDrawingPatriarch();
+
int line = 0;
double totalPageHeight = 0;
for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
- Map info = generatorRoomOweFee(sheet, workbook, rooms.getJSONObject(roomIndex), line, totalPageHeight, patriarch, feePrint);
+ Map<String, Object> info = generatorRoomOweFee(sheet, workbook, rooms.getJSONObject(roomIndex), line, totalPageHeight, patriarch, feePrint);
line = Integer.parseInt(info.get("line").toString()) + 1;
totalPageHeight = Double.parseDouble(info.get("totalPageHeight").toString());
}
@@ -196,11 +197,13 @@
String[] feePrintRemarks = null;
if (feePrint != null) {
feePrintRemarks = feePrint.getString("content").toLowerCase().replace("</br>", "").split("\n");
+ } else {
+ feePrintRemarks = new String[]{""};
}
int defaultRowHeight = 280;
//璁＄畻褰撳墠鍗曞瓙鐨勯珮搴�
int titleHeight = defaultRowHeight * 3;
- int subTitleHeight = defaultRowHeight * 4;
+ int subTitleHeight = defaultRowHeight * 5;
int totalHeight = titleHeight + subTitleHeight + defaultRowHeight * 3 + fees.size() * defaultRowHeight;
//澶囨敞锛屽姞涓婃墦鍗伴厤缃唴瀹�
if (feePrintRemarks != null && feePrintRemarks.length > 0) {
@@ -241,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("榛戜綋");
@@ -257,7 +264,7 @@
sheet.addMergedRegion(region);
- //绗竴琛�
+ //瀛愭爣棰�
if (feePrint != null) {
XSSFClientAnchor anchor = new XSSFClientAnchor(0, 0, 0, 0, (short) 0, 1 + line, (short) 1, 1 + line + 1);
anchor.setAnchorType(ClientAnchor.AnchorType.MOVE_AND_RESIZE);//璁剧疆鍥剧墖闅忓崟鍏冪Щ鍔ㄨ皟鏁村ぇ灏�
@@ -274,32 +281,36 @@
subTitleCellStyle.setAlignment(HorizontalAlignment.CENTER);
subTitleCellStyle.setVerticalAlignment(VerticalAlignment.BOTTOM);
row = sheet.createRow(1 + line);
-// cell0 = row.createCell(0);
-// cell0.setCellValue("鏀惰垂浜岀淮鐮�");
-// cell0.setCellStyle(subTitleCellStyle);
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);
cell5.setCellValue(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
cell5.setCellStyle(subTitleCellStyle);
- row.setHeight((short) (subTitleHeight));
CellStyle rowCellStyle = workbook.createCellStyle();
rowCellStyle.setVerticalAlignment(VerticalAlignment.BOTTOM);
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);
- row.setHeight((short) (titleHeight));
+ //瀛愭爣棰橀珮搴�
+ row.setHeight((short) (subTitleHeight));
row = sheet.createRow(2 + line);
@@ -309,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);
@@ -346,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"));
@@ -392,7 +407,7 @@
sheet.addMergedRegion(region);
if (feePrintRemarks != null && feePrintRemarks.length > 0) {
- for(int remarkIndex = 0 ;remarkIndex < feePrintRemarks.length; remarkIndex++) {
+ for (int remarkIndex = 0; remarkIndex < feePrintRemarks.length; remarkIndex++) {
row = sheet.createRow(line + fees.size() + 4 + remarkIndex);
row.createCell(0).setCellValue(feePrintRemarks[remarkIndex]);
row.setHeight((short) (defaultRowHeight));
--
Gitblit v1.8.0