From ce64e667815b39efdc2f8bd52be0d43d49db8d84 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 17 七月 2022 00:06:29 +0800
Subject: [PATCH] 优化小区位置
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 243 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 198 insertions(+), 45 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
index 1e9cd25..0b6edfb 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java
@@ -76,6 +76,7 @@
public static final String RESOURCE_STORE_USE_RECORD_MANAGE = "resourceStoreUseRecordManage";
public static final String RESOURCE_STAFF_FEE_MANAGE = "staffFeeManage";
public static final String REPORT_PAY_FEE_DEPOSIT = "reportPayFeeDeposit";
+ public static final String INSPECTION_TASK_DETAILS = "inspectionTaskDetails";
@Autowired
private RestTemplate restTemplate;
@@ -168,6 +169,8 @@
case REPORT_PAY_FEE_DEPOSIT:
reportPayFeeDeposit(pd, result, workbook);
break;
+ case INSPECTION_TASK_DETAILS:
+ inspectionTaskDetails(pd, result, workbook);
}
ByteArrayOutputStream os = new ByteArrayOutputStream();
MultiValueMap headers = new HttpHeaders();
@@ -206,15 +209,16 @@
Row row = sheet.createRow(0);
row.createCell(0).setCellValue("鏀惰垂瀵硅薄");
row.createCell(1).setCellValue("涓氫富鍚嶇О");
- row.createCell(2).setCellValue("寮�濮嬫椂闂�");
- row.createCell(3).setCellValue("缁撴潫鏃堕棿");
+ row.createCell(2).setCellValue("鎵嬫満鍙�");
+ row.createCell(3).setCellValue("寮�濮嬫椂闂�");
+ row.createCell(4).setCellValue("缁撴潫鏃堕棿");
if (!StringUtil.isEmpty(configIds)) {
for (int feeConfigIndex = 0; feeConfigIndex < feeConfigDtos.size(); feeConfigIndex++) {
- row.createCell(4 + feeConfigIndex).setCellValue(feeConfigDtos.get(feeConfigIndex).getFeeName());
+ row.createCell(5 + feeConfigIndex).setCellValue(feeConfigDtos.get(feeConfigIndex).getFeeName());
}
- row.createCell(4 + feeConfigDtos.size()).setCellValue("鍚堣");
+ row.createCell(5 + feeConfigDtos.size()).setCellValue("鍚堣");
} else {
- row.createCell(4).setCellValue("鍚堣");
+ row.createCell(5).setCellValue("鍚堣");
}
@@ -224,15 +228,16 @@
dataObj = oweFees.getJSONObject(roomIndex);
row.createCell(0).setCellValue(dataObj.getString("payerObjName"));
row.createCell(1).setCellValue(dataObj.getString("ownerName"));
- row.createCell(2).setCellValue(dataObj.getString("endTime"));
- row.createCell(3).setCellValue(dataObj.getString("deadlineTime"));
+ row.createCell(2).setCellValue(dataObj.getString("ownerTel"));
+ row.createCell(3).setCellValue(dataObj.getString("endTime"));
+ row.createCell(4).setCellValue(dataObj.getString("deadlineTime"));
if (!StringUtil.isEmpty(configIds)) {
for (int feeConfigIndex = 0; feeConfigIndex < feeConfigDtos.size(); feeConfigIndex++) {
- row.createCell(4 + feeConfigIndex).setCellValue(getFeeConfigAmount(feeConfigDtos.get(feeConfigIndex), dataObj));
+ row.createCell(5 + feeConfigIndex).setCellValue(getFeeConfigAmount(feeConfigDtos.get(feeConfigIndex), dataObj));
}
- row.createCell(4 + feeConfigDtos.size()).setCellValue(getAllFeeOweAmount(feeConfigDtos, dataObj));
+ row.createCell(5 + feeConfigDtos.size()).setCellValue(getAllFeeOweAmount(feeConfigDtos, dataObj));
} else {
- row.createCell(4).setCellValue(getAllFeeOweAmount(feeConfigDtos, dataObj));
+ row.createCell(5).setCellValue(getAllFeeOweAmount(feeConfigDtos, dataObj));
}
}
@@ -485,7 +490,7 @@
private void reportPrePaymentFee(IPageData pd, ComponentValidateResult result, Workbook workbook) {
Sheet sheet = workbook.createSheet("棰勪氦璐规彁閱掕〃");
Row row = sheet.createRow(0);
- row.createCell(0).setCellValue("搴忓彿");
+ row.createCell(0).setCellValue("鎴垮彿");
row.createCell(1).setCellValue("璐圭敤椤�");
row.createCell(2).setCellValue("璐圭敤寮�濮嬫椂闂�");
row.createCell(3).setCellValue("璺濈璐圭敤寮�濮嬫椂闂达紙澶╋級");
@@ -508,7 +513,7 @@
private void reportDeadlineFee(IPageData pd, ComponentValidateResult result, Workbook workbook) {
Sheet sheet = workbook.createSheet("璐圭敤鍒版湡鎻愰啋琛�");
Row row = sheet.createRow(0);
- row.createCell(0).setCellValue("搴忓彿");
+ row.createCell(0).setCellValue("鎴垮彿");
row.createCell(1).setCellValue("璐圭敤椤�");
row.createCell(2).setCellValue("璐圭敤缁撴潫鏃堕棿");
row.createCell(3).setCellValue("璺濈璐圭敤缁撴潫鏃堕棿锛堝ぉ锛�");
@@ -877,6 +882,72 @@
}
}
+ private void inspectionTaskDetails(IPageData pd, ComponentValidateResult result, Workbook workbook) {
+ Sheet sheet = workbook.createSheet("宸℃鏄庣粏");
+ Row row = sheet.createRow(0);
+ row.createCell(0).setCellValue("浠诲姟璇︽儏ID");
+ row.createCell(1).setCellValue("宸℃鐐瑰悕绉�");
+ row.createCell(2).setCellValue("宸℃璁″垝鍚嶇О");
+ row.createCell(3).setCellValue("宸℃璺嚎鍚嶇О");
+ row.createCell(4).setCellValue("宸℃浜哄紑濮嬫椂闂�");
+ row.createCell(5).setCellValue("宸℃浜虹粨鏉熸椂闂�");
+ row.createCell(6).setCellValue("宸℃鐐瑰紑濮嬫椂闂�");
+ row.createCell(7).setCellValue("宸℃鐐圭粨鏉熸椂闂�");
+ row.createCell(8).setCellValue("瀹為檯宸℃鏃堕棿");
+ row.createCell(9).setCellValue("瀹為檯绛惧埌鐘舵��");
+ row.createCell(10).setCellValue("璁″垝宸℃浜�");
+ row.createCell(11).setCellValue("瀹為檯宸℃浜�");
+ row.createCell(12).setCellValue("宸℃鏂瑰紡");
+ row.createCell(13).setCellValue("浠诲姟鐘舵��");
+ row.createCell(14).setCellValue("宸℃鐐圭姸鎬�");
+ row.createCell(15).setCellValue("宸℃鎯呭喌");
+ JSONArray inspectionTaskDetails = this.getInspectionTaskDetails(pd, result);
+ if (inspectionTaskDetails == null || inspectionTaskDetails.size() == 0) {
+ return;
+ }
+ JSONObject dataObj = null;
+ for (int roomIndex = 0; roomIndex < inspectionTaskDetails.size(); roomIndex++) {
+ row = sheet.createRow(roomIndex + 1);
+ dataObj = inspectionTaskDetails.getJSONObject(roomIndex);
+ row.createCell(0).setCellValue(dataObj.getString("taskDetailId"));
+ row.createCell(1).setCellValue(dataObj.getString("inspectionName"));
+ row.createCell(2).setCellValue(dataObj.getString("inspectionPlanName"));
+ row.createCell(3).setCellValue(dataObj.getString("routeName"));
+ row.createCell(4).setCellValue(dataObj.getString("planInsTime"));
+ row.createCell(5).setCellValue(dataObj.getString("planEndTime"));
+ if (!StringUtil.isEmpty(dataObj.getString("pointStartTime"))) {
+ row.createCell(6).setCellValue(dataObj.getString("pointStartTime"));
+ } else {
+ row.createCell(6).setCellValue("--");
+ }
+ if (!StringUtil.isEmpty(dataObj.getString("pointEndTime"))) {
+ row.createCell(7).setCellValue(dataObj.getString("pointEndTime"));
+ } else {
+ row.createCell(7).setCellValue("--");
+ }
+ if (!StringUtil.isEmpty(dataObj.getString("inspectionTime"))) {
+ row.createCell(8).setCellValue(dataObj.getString("inspectionTime"));
+ } else {
+ row.createCell(8).setCellValue("--");
+ }
+ row.createCell(9).setCellValue(dataObj.getString("inspectionStateName"));
+ row.createCell(10).setCellValue(dataObj.getString("planUserName"));
+ if (!StringUtil.isEmpty(dataObj.getString("actUserName"))) {
+ row.createCell(11).setCellValue(dataObj.getString("actUserName"));
+ } else {
+ row.createCell(11).setCellValue("--");
+ }
+ row.createCell(12).setCellValue(dataObj.getString("signTypeName"));
+ row.createCell(13).setCellValue(dataObj.getString("taskStateName"));
+ row.createCell(14).setCellValue(dataObj.getString("stateName"));
+ if (!StringUtil.isEmpty(dataObj.getString("description"))) {
+ row.createCell(15).setCellValue(dataObj.getString("description"));
+ } else {
+ row.createCell(15).setCellValue("--");
+ }
+ }
+ }
+
private void resourceStoreUseRecordManage(IPageData pd, ComponentValidateResult result, Workbook workbook) {
Sheet sheet = workbook.createSheet("鐗╁搧浣跨敤璁板綍");
Row row = sheet.createRow(0);
@@ -1032,6 +1103,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
+ reqJson.put("hasOweFee","Y");
apiUrl = "/reportOweFee/queryReportAllOweFee" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
@@ -1125,6 +1197,7 @@
String apiUrl = "";
ResponseEntity<String> responseEntity = null;
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
+ reqJson.put("store-id", result.getStoreId());
reqJson.put("page", 1);
reqJson.put("row", 10000);
apiUrl = "/reportQuestionAnswer/queryUserQuestionAnswerValue" + mapToUrlParam(reqJson);
@@ -1219,6 +1292,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
+ reqJson.put("storeId",result.getStoreId());
apiUrl = "purchaseApplyDetail.listPurchaseApplyDetails" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
@@ -1385,6 +1459,29 @@
return savedAllocationUserStorehouses.getJSONArray("data");
}
+ private JSONArray getInspectionTaskDetails(IPageData pd, ComponentValidateResult result) {
+ String apiUrl = "";
+ ResponseEntity<String> responseEntity = null;
+ JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
+ reqJson.put("page", 1);
+ reqJson.put("row", 10000);
+ apiUrl = "inspectionTaskDetail.listInspectionTaskDetails" + mapToUrlParam(reqJson);
+ responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
+ return null;
+ }
+ JSONObject savedInspectionTaskDetails = JSONObject.parseObject(responseEntity.getBody(), Feature.OrderedField);
+ //鑾峰彇闄愬埗鏉℃暟鐨勫��
+ int number = Integer.parseInt(MappingCache.getValue(DOMAIN_COMMON, EXPORT_NUMBER));
+ if (savedInspectionTaskDetails.getJSONArray("inspectionTaskDetails").size() > number) {
+ throw new IllegalArgumentException("瀵煎嚭鏁版嵁瓒呰繃闄愬埗鏉℃暟" + number + "鏉★紝鏃犳硶缁х画瀵煎嚭鎿嶄綔锛�");
+ }
+ if (!savedInspectionTaskDetails.containsKey("inspectionTaskDetails")) {
+ return null;
+ }
+ return savedInspectionTaskDetails.getJSONArray("inspectionTaskDetails");
+ }
+
private JSONArray getResourceStoreUseRecordManage(IPageData pd, ComponentValidateResult result) {
String apiUrl = "";
ResponseEntity<String> responseEntity = null;
@@ -1437,7 +1534,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = "reportFeeMonthStatistics/queryPayFeeDeposit" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics/queryPayFeeDeposit" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1486,8 +1583,9 @@
row.createCell(3).setCellValue("闈㈢Н");
row.createCell(4).setCellValue("璐圭敤椤�");
row.createCell(5).setCellValue("璐圭敤寮�濮嬫椂闂�");
- row.createCell(6).setCellValue("娆犺垂鏃堕暱锛堝ぉ锛�");
- row.createCell(7).setCellValue("娆犺垂閲戦");
+ row.createCell(6).setCellValue("鏇存柊鏃堕棿");
+ row.createCell(7).setCellValue("娆犺垂鏃堕暱锛堝ぉ锛�");
+ row.createCell(8).setCellValue("娆犺垂閲戦");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportOweFeeDetail(pd, result);
if (rooms == null || rooms.size() == 0) {
@@ -1503,8 +1601,9 @@
row.createCell(3).setCellValue(dataObj.getString("builtUpArea"));
row.createCell(4).setCellValue(dataObj.getString("feeName"));
row.createCell(5).setCellValue(dataObj.getString("feeCreateTime"));
- row.createCell(6).setCellValue(dataObj.getString("oweDay"));
- row.createCell(7).setCellValue(dataObj.getString("oweAmount"));
+ row.createCell(6).setCellValue(dataObj.getString("updateTime"));
+ row.createCell(7).setCellValue(dataObj.getString("oweDay"));
+ row.createCell(8).setCellValue(dataObj.getString("oweAmount"));
}
}
@@ -1518,8 +1617,15 @@
row.createCell(4).setCellValue("璐圭敤椤�");
row.createCell(5).setCellValue("璐圭敤寮�濮嬫椂闂�");
row.createCell(6).setCellValue("璐圭敤缁撴潫鏃堕棿");
- row.createCell(7).setCellValue("搴旀敹閲戦");
- row.createCell(8).setCellValue("瀹炴敹閲戦");
+ row.createCell(7).setCellValue("鍘嗗彶娆犺垂(鍗曚綅:鍏�)");
+ row.createCell(8).setCellValue("褰撴湀搴旀敹(鍗曚綅:鍏�)");
+ row.createCell(9).setCellValue("搴旀敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(10).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
+ row.createCell(11).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
+ row.createCell(12).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
+ row.createCell(13).setCellValue("瀹炴敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(14).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
+ row.createCell(15).setCellValue("鏇存柊鏃堕棿");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFeeDetail(pd, result);
if (rooms == null || rooms.size() == 0) {
@@ -1536,8 +1642,20 @@
row.createCell(4).setCellValue(dataObj.getString("feeName"));
row.createCell(5).setCellValue(dataObj.getString("feeCreateTime"));
row.createCell(6).setCellValue(dataObj.getString("deadlineTime"));
- row.createCell(7).setCellValue(dataObj.getString("receivableAmount"));
- row.createCell(8).setCellValue(dataObj.getString("receivedAmount"));
+ row.createCell(7).setCellValue(dataObj.getString("hisOweAmount"));
+ row.createCell(8).setCellValue(dataObj.getString("curReceivableAmount"));
+ BigDecimal hisOweAmount = new BigDecimal(dataObj.getString("hisOweAmount"));
+ BigDecimal curReceivableAmount = new BigDecimal(dataObj.getString("curReceivableAmount"));
+ row.createCell(9).setCellValue(hisOweAmount.add(curReceivableAmount).toString());
+ row.createCell(10).setCellValue(dataObj.getString("curReceivedAmount"));
+ row.createCell(11).setCellValue(dataObj.getString("hisOweReceivedAmount"));
+ row.createCell(12).setCellValue(dataObj.getString("preReceivedAmount"));
+ BigDecimal curReceivedAmount = new BigDecimal(dataObj.getString("curReceivedAmount"));
+ BigDecimal hisOweReceivedAmount = new BigDecimal(dataObj.getString("hisOweReceivedAmount"));
+ BigDecimal preReceivedAmount = new BigDecimal(dataObj.getString("preReceivedAmount"));
+ row.createCell(13).setCellValue(hisOweReceivedAmount.add(preReceivedAmount).add(curReceivedAmount).toString());
+ row.createCell(14).setCellValue(hisOweAmount.add(curReceivableAmount).subtract(curReceivedAmount).subtract(hisOweReceivedAmount).toString());
+ row.createCell(15).setCellValue(dataObj.getString("updateTime"));
}
}
@@ -1595,10 +1713,13 @@
row.createCell(2).setCellValue("璐圭敤椤�");
row.createCell(3).setCellValue("鍘嗗彶娆犺垂(鍗曚綅:鍏�)");
row.createCell(4).setCellValue("褰撴湀搴旀敹(鍗曚綅:鍏�)");
- row.createCell(5).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
- row.createCell(6).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
- row.createCell(7).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
- row.createCell(8).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
+ row.createCell(5).setCellValue("搴旀敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(6).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
+ row.createCell(7).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
+ row.createCell(8).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
+ row.createCell(9).setCellValue("瀹炴敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(10).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
+ row.createCell(11).setCellValue("鏇存柊鏃堕棿");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFeeBreakdown(pd, result);
if (rooms == null || rooms.size() == 0) {
@@ -1614,14 +1735,22 @@
row.createCell(2).setCellValue(dataObj.getString("feeName"));
row.createCell(3).setCellValue(dataObj.getString("hisOweAmount"));
row.createCell(4).setCellValue(dataObj.getString("curReceivableAmount"));
- row.createCell(5).setCellValue(dataObj.getString("curReceivedAmount"));
- row.createCell(6).setCellValue(dataObj.getString("hisOweReceivedAmount"));
- row.createCell(7).setCellValue(dataObj.getString("preReceivedAmount"));
+ BigDecimal hisOweAmount = new BigDecimal(dataObj.getString("hisOweAmount"));
+ BigDecimal curReceivableAmount = new BigDecimal(dataObj.getString("curReceivableAmount"));
+ row.createCell(5).setCellValue(hisOweAmount.add(curReceivableAmount).toString());
+ row.createCell(6).setCellValue(dataObj.getString("curReceivedAmount"));
+ row.createCell(7).setCellValue(dataObj.getString("hisOweReceivedAmount"));
+ row.createCell(8).setCellValue(dataObj.getString("preReceivedAmount"));
+ BigDecimal curReceivedAmount = new BigDecimal(dataObj.getString("curReceivedAmount"));
+ BigDecimal hisOweReceivedAmount = new BigDecimal(dataObj.getString("hisOweReceivedAmount"));
+ BigDecimal preReceivedAmount = new BigDecimal(dataObj.getString("preReceivedAmount"));
+ row.createCell(9).setCellValue(hisOweReceivedAmount.add(preReceivedAmount).add(curReceivedAmount).toString());
oweFeeDec = new BigDecimal(Double.parseDouble(dataObj.getString("hisOweAmount")))
.add(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivableAmount"))))
.subtract(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivedAmount"))))
.subtract(new BigDecimal(Double.parseDouble(dataObj.getString("hisOweReceivedAmount")))).setScale(2, BigDecimal.ROUND_HALF_UP);
- row.createCell(8).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
+ row.createCell(10).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
+ row.createCell(11).setCellValue(dataObj.getString("updateTime"));
}
}
@@ -1656,10 +1785,13 @@
row.createCell(2).setCellValue("鍗曞厓");
row.createCell(3).setCellValue("鍘嗗彶娆犺垂(鍗曚綅:鍏�)");
row.createCell(4).setCellValue("褰撴湀搴旀敹(鍗曚綅:鍏�)");
- row.createCell(5).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
- row.createCell(6).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
- row.createCell(7).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
- row.createCell(8).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
+ row.createCell(5).setCellValue("搴旀敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(6).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
+ row.createCell(7).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
+ row.createCell(8).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
+ row.createCell(9).setCellValue("瀹炴敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(10).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
+ row.createCell(11).setCellValue("鏇存柊鏃堕棿");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFloorUnitFeeSummary(pd, result);
if (rooms == null || rooms.size() == 0) {
@@ -1675,14 +1807,22 @@
row.createCell(2).setCellValue(dataObj.getString("unitNum") + "鍗曞厓");
row.createCell(3).setCellValue(dataObj.getString("hisOweAmount"));
row.createCell(4).setCellValue(dataObj.getString("curReceivableAmount"));
- row.createCell(5).setCellValue(dataObj.getString("curReceivedAmount"));
- row.createCell(6).setCellValue(dataObj.getString("hisOweReceivedAmount"));
- row.createCell(7).setCellValue(dataObj.getString("preReceivedAmount"));
+ BigDecimal hisOweAmount = new BigDecimal(dataObj.getString("hisOweAmount"));
+ BigDecimal curReceivableAmount = new BigDecimal(dataObj.getString("curReceivableAmount"));
+ row.createCell(5).setCellValue(hisOweAmount.add(curReceivableAmount).toString());
+ row.createCell(6).setCellValue(dataObj.getString("curReceivedAmount"));
+ row.createCell(7).setCellValue(dataObj.getString("hisOweReceivedAmount"));
+ row.createCell(8).setCellValue(dataObj.getString("preReceivedAmount"));
+ BigDecimal hisOweReceivedAmount = new BigDecimal(dataObj.getString("hisOweReceivedAmount"));
+ BigDecimal preReceivedAmount = new BigDecimal(dataObj.getString("preReceivedAmount"));
+ BigDecimal curReceivedAmount = new BigDecimal(dataObj.getString("curReceivedAmount"));
+ row.createCell(9).setCellValue(hisOweReceivedAmount.add(preReceivedAmount).add(curReceivedAmount).toString());
oweFeeDec = new BigDecimal(Double.parseDouble(dataObj.getString("hisOweAmount")))
.add(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivableAmount"))))
.subtract(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivedAmount"))))
.subtract(new BigDecimal(Double.parseDouble(dataObj.getString("hisOweReceivedAmount")))).setScale(2, BigDecimal.ROUND_HALF_UP);
- row.createCell(8).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
+ row.createCell(10).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
+ row.createCell(11).setCellValue(dataObj.getString("updateTime"));
}
}
@@ -1752,10 +1892,14 @@
row.createCell(0).setCellValue("鏃ユ湡");
row.createCell(1).setCellValue("鍘嗗彶娆犺垂(鍗曚綅:鍏�)");
row.createCell(2).setCellValue("褰撴湀搴旀敹(鍗曚綅:鍏�)");
- row.createCell(3).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
- row.createCell(4).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
- row.createCell(5).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
- row.createCell(6).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
+ row.createCell(3).setCellValue("搴旀敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(4).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
+ row.createCell(5).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
+ row.createCell(6).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
+ row.createCell(7).setCellValue("瀹炴敹鍚堣(鍗曚綅:鍏�)");
+ row.createCell(8).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
+ row.createCell(9).setCellValue("鏀惰垂鐜�");
+ row.createCell(10).setCellValue("鏇存柊鏃堕棿");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFeeSummaryFee(pd, componentValidateResult);
if (rooms == null || rooms.size() == 0) {
@@ -1769,14 +1913,23 @@
row.createCell(0).setCellValue(dataObj.getString("feeYear") + "骞�" + dataObj.getString("feeMonth") + "鏈�");
row.createCell(1).setCellValue(dataObj.getString("hisOweAmount"));
row.createCell(2).setCellValue(dataObj.getString("curReceivableAmount"));
- row.createCell(3).setCellValue(dataObj.getString("curReceivedAmount"));
- row.createCell(4).setCellValue(dataObj.getString("hisOweReceivedAmount"));
- row.createCell(5).setCellValue(dataObj.getString("preReceivedAmount"));
+ BigDecimal hisOweAmount = new BigDecimal(dataObj.getString("hisOweAmount"));
+ BigDecimal curReceivableAmount = new BigDecimal(dataObj.getString("curReceivableAmount"));
+ row.createCell(3).setCellValue(hisOweAmount.add(curReceivableAmount).toString());
+ row.createCell(4).setCellValue(dataObj.getString("curReceivedAmount"));
+ row.createCell(5).setCellValue(dataObj.getString("hisOweReceivedAmount"));
+ row.createCell(6).setCellValue(dataObj.getString("preReceivedAmount"));
+ BigDecimal curReceivedAmount = new BigDecimal(dataObj.getString("curReceivedAmount"));
+ BigDecimal hisOweReceivedAmount = new BigDecimal(dataObj.getString("hisOweReceivedAmount"));
+ BigDecimal preReceivedAmount = new BigDecimal(dataObj.getString("preReceivedAmount"));
+ row.createCell(7).setCellValue(curReceivedAmount.add(hisOweReceivedAmount).add(preReceivedAmount).toString());
oweFeeDec = new BigDecimal(Double.parseDouble(dataObj.getString("hisOweAmount")))
.add(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivableAmount"))))
.subtract(new BigDecimal(Double.parseDouble(dataObj.getString("curReceivedAmount"))))
.subtract(new BigDecimal(Double.parseDouble(dataObj.getString("hisOweReceivedAmount")))).setScale(2, BigDecimal.ROUND_HALF_UP);
- row.createCell(6).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
+ row.createCell(8).setCellValue(oweFeeDec.doubleValue() < 0 ? "0" : oweFeeDec.doubleValue() + "");
+ row.createCell(9).setCellValue(dataObj.getString("chargeRate"));
+ row.createCell(10).setCellValue(dataObj.getString("updateTime"));
}
}
--
Gitblit v1.8.0