From 74be20dfb5b244bbae3387db7a1aecb9fc1a21bd Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期三, 16 六月 2021 18:22:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 1592b6b..9edc1f1
--- 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,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;
//璁＄畻褰撳墠鍗曞瓙鐨勯珮搴�
@@ -390,7 +393,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