From 4145c533ebfcd4e5da503526170e7eeeb4c9dace Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 13 七月 2022 17:17:02 +0800
Subject: [PATCH] 8.费用--欠费信息中，导出功能中，多导出了一条金额为零的数据，但是列表中是不存在的
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 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 86160f3..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
@@ -209,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("鍚堣");
}
@@ -227,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));
}
}
@@ -488,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("璺濈璐圭敤寮�濮嬫椂闂达紙澶╋級");
@@ -511,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("璺濈璐圭敤缁撴潫鏃堕棿锛堝ぉ锛�");
@@ -1101,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) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
@@ -1289,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) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
@@ -1579,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) {
@@ -1596,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"));
}
}
--
Gitblit v1.8.0