From 7b90160465723602365521fa85e233680b60dd5e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期五, 12 五月 2023 17:16:25 +0800
Subject: [PATCH] optimize statistics
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 219 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 182 insertions(+), 37 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..cd216af 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
@@ -16,6 +16,7 @@
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* @ClassName AssetImportSmoImpl
@@ -56,6 +58,7 @@
public static final String REPORT_FLOOR_UNIT_FEE_SUMMARY = "reportFloorUnitFeeSummary";
public static final String REPORT_FEE_BREAKDOWN = "reportFeeBreakdown";
public static final String REPORT_FEE_DETAIL = "reportFeeDetail";
+ public static final String REPORT_RETURN_PAY_FEE_MANAGE = "returnPayFeeManage";
public static final String REPORT_OWE_FEE_DETAIL = "reportOweFeeDetail";
public static final String REPORT_PAY_FEE_DETAIL = "reportPayFeeDetail";
public static final String REPORT_YEAR_COLLECTION = "reportYearCollection";
@@ -85,14 +88,27 @@
public ResponseEntity<Object> exportExcelData(IPageData pd) throws Exception {
ComponentValidateResult result = this.validateStoreStaffCommunityRelationship(pd, restTemplate);
+ Map pdHeaders = pd.getHeaders();
+ if (!StringUtil.isEmpty(result.getStoreId())) {
+ pdHeaders.remove("store-id");
+ pdHeaders.put("store-id", result.getStoreId());
+ }
+ if (!StringUtil.isEmpty(result.getLoginUserId())) {
+ pdHeaders.remove("user-id");
+ pdHeaders.remove("user_id");
+ pdHeaders.put("user-id", result.getUserId());
+ pdHeaders.put("user_id", result.getUserId());
+ pdHeaders.put("login-user-id",result.getLoginUserId());
+ }
Assert.hasKeyAndValue(JSONObject.parseObject(pd.getReqData()), "communityId", "璇锋眰涓湭鍖呭惈灏忓尯");
Assert.hasKeyAndValue(JSONObject.parseObject(pd.getReqData()), "pagePath", "璇锋眰涓湭鍖呭惈椤甸潰");
- Workbook workbook = null; //宸ヤ綔绨�
+ SXSSFWorkbook workbook = null; //宸ヤ綔绨�
String userId = "";
//宸ヤ綔琛�
- workbook = new XSSFWorkbook();
+ workbook = new SXSSFWorkbook();
+ workbook.setCompressTempFiles(false);
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
String pagePath = reqJson.getString("pagePath");
@@ -105,6 +121,9 @@
break;
case REPORT_FEE_BREAKDOWN:
reportFeeBreakdown(pd, result, workbook);
+ break;
+ case REPORT_RETURN_PAY_FEE_MANAGE:
+ returnPayFeeManage(pd, result, workbook);
break;
case REPORT_FEE_DETAIL:
reportFeeDetail(pd, result, workbook);
@@ -209,15 +228,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 +247,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));
}
}
@@ -352,11 +373,12 @@
row.createCell(11).setCellValue("瀹炴敹閲戦");
row.createCell(12).setCellValue("浼樻儬閲戦");
row.createCell(13).setCellValue("鍑忓厤閲戦");
- row.createCell(14).setCellValue("婊炵撼閲�");
- row.createCell(15).setCellValue("绌虹疆鎴挎墦鎶橀噾棰�");
- row.createCell(16).setCellValue("绌虹疆鎴垮噺鍏嶉噾棰�");
- row.createCell(17).setCellValue("闈㈢Н");
- row.createCell(18).setCellValue("杞︿綅");
+ row.createCell(14).setCellValue("璧犻�侀噾棰�");
+ row.createCell(15).setCellValue("婊炵撼閲�");
+ row.createCell(16).setCellValue("绌虹疆鎴挎墦鎶橀噾棰�");
+ row.createCell(17).setCellValue("绌虹疆鎴垮噺鍏嶉噾棰�");
+ row.createCell(18).setCellValue("闈㈢Н");
+ row.createCell(19).setCellValue("杞︿綅");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportPayFeeDetail(pd, result);
if (rooms == null || rooms.size() == 0) {
@@ -367,7 +389,11 @@
row = sheet.createRow(roomIndex + 1);
dataObj = rooms.getJSONObject(roomIndex);
row.createCell(0).setCellValue(dataObj.getString("oId"));
- row.createCell(1).setCellValue(dataObj.getString("objName"));
+ if (!StringUtil.isEmpty(dataObj.getString("payerObjType")) && dataObj.getString("payerObjType").equals("3333")) { //鎴垮眿
+ row.createCell(1).setCellValue(dataObj.getString("floorNum") + "-" + dataObj.getString("unitNum") + "-" + dataObj.getString("roomNum"));
+ } else {
+ row.createCell(1).setCellValue(dataObj.getString("objName"));
+ }
row.createCell(2).setCellValue(dataObj.getString("ownerName"));
row.createCell(3).setCellValue(dataObj.getString("feeName"));
row.createCell(4).setCellValue(dataObj.getString("feeTypeCdName"));
@@ -380,11 +406,12 @@
row.createCell(11).setCellValue(dataObj.getDouble("receivedAmount"));
row.createCell(12).setCellValue(dataObj.getDouble("preferentialAmount"));
row.createCell(13).setCellValue(dataObj.getDouble("deductionAmount"));
- row.createCell(14).setCellValue(dataObj.getDouble("lateFee"));
- row.createCell(15).setCellValue(dataObj.getDouble("vacantHousingDiscount"));
- row.createCell(16).setCellValue(dataObj.getDouble("vacantHousingReduction"));
- row.createCell(17).setCellValue(dataObj.getString("builtUpArea"));
- row.createCell(18).setCellValue(dataObj.getString("psName"));
+ row.createCell(14).setCellValue(dataObj.getDouble("giftAmount"));
+ row.createCell(15).setCellValue(dataObj.getDouble("lateFee"));
+ row.createCell(16).setCellValue(dataObj.getDouble("vacantHousingDiscount"));
+ row.createCell(17).setCellValue(dataObj.getDouble("vacantHousingReduction"));
+ row.createCell(18).setCellValue(dataObj.getString("builtUpArea"));
+ row.createCell(19).setCellValue(dataObj.getString("psName"));
}
}
@@ -488,7 +515,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("璺濈璐圭敤寮�濮嬫椂闂达紙澶╋級");
@@ -501,7 +528,11 @@
for (int roomIndex = 0; roomIndex < prePayFees.size(); roomIndex++) {
row = sheet.createRow(roomIndex + 1);
dataObj = prePayFees.getJSONObject(roomIndex);
- row.createCell(0).setCellValue(dataObj.getString("objName"));
+ if (!StringUtil.isEmpty(dataObj.getString("payerObjType")) && dataObj.getString("payerObjType").equals("3333")) { //鎴垮眿
+ row.createCell(0).setCellValue(dataObj.getString("floorNum") + "-" + dataObj.getString("unitNum") + "-" + dataObj.getString("roomNum"));
+ } else {
+ row.createCell(0).setCellValue(dataObj.getString("objName"));
+ }
row.createCell(1).setCellValue(dataObj.getString("feeName"));
row.createCell(2).setCellValue(dataObj.getString("endTime"));
row.createCell(3).setCellValue(dataObj.getString("oweDay"));
@@ -511,7 +542,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("璺濈璐圭敤缁撴潫鏃堕棿锛堝ぉ锛�");
@@ -524,7 +555,7 @@
for (int roomIndex = 0; roomIndex < deadlineFees.size(); roomIndex++) {
row = sheet.createRow(roomIndex + 1);
dataObj = deadlineFees.getJSONObject(roomIndex);
- row.createCell(0).setCellValue(dataObj.getString("objName"));
+ row.createCell(0).setCellValue(dataObj.getString("objNameNum"));
row.createCell(1).setCellValue(dataObj.getString("feeName"));
row.createCell(2).setCellValue(dataObj.getString("deadlineTime"));
row.createCell(3).setCellValue(dataObj.getString("oweDay"));
@@ -573,7 +604,7 @@
row.createCell(11).setCellValue("鐢宠鏁伴噺");
row.createCell(12).setCellValue("閲囪喘/鍑哄簱鏁伴噺");
row.createCell(13).setCellValue("閲囪喘浠锋牸");
- row.createCell(14).setCellValue("閲囪喘鎬讳环");
+ row.createCell(14).setCellValue("鎬讳环");
row.createCell(15).setCellValue("鐢宠澶囨敞");
row.createCell(16).setCellValue("鐘舵��");
row.createCell(17).setCellValue("鍒涘缓鏃堕棿");
@@ -600,8 +631,8 @@
row.createCell(11).setCellValue(dataObj.getString("quantity") + dataObj.getString("unitCodeName"));
row.createCell(12).setCellValue(dataObj.getString("purchaseQuantity") + dataObj.getString("unitCodeName"));
row.createCell(13).setCellValue(dataObj.getString("price"));
- if (!StringUtil.isEmpty(dataObj.getString("resOrderType")) && dataObj.getString("resOrderType").equals("10000") &&
- !StringUtil.isEmpty(dataObj.getString("purchaseQuantity")) && !StringUtil.isEmpty(dataObj.getString("price"))) { //鐘舵�佹槸鍏ュ簱
+ //!StringUtil.isEmpty(dataObj.getString("resOrderType")) && dataObj.getString("resOrderType").equals("10000") &&
+ if (!StringUtil.isEmpty(dataObj.getString("purchaseQuantity")) && !StringUtil.isEmpty(dataObj.getString("price"))) { //鐘舵�佹槸鍏ュ簱
//鑾峰彇閲囪喘鏁伴噺
double purchaseQuantity = Double.parseDouble(dataObj.getString("purchaseQuantity"));
//鑾峰彇閲囪喘鍗曚环
@@ -1036,7 +1067,11 @@
row = sheet.createRow(roomIndex + 1);
dataObj = reportPayFeeDeposits.getJSONObject(roomIndex);
row.createCell(0).setCellValue(dataObj.getString("feeId"));
- row.createCell(1).setCellValue(dataObj.getString("objName"));
+ if (!StringUtil.isEmpty(dataObj.getString("payerObjType")) && dataObj.getString("payerObjType").equals("3333")) { //鎴垮眿
+ row.createCell(1).setCellValue(dataObj.getString("floorNum") + "-" + dataObj.getString("unitNum") + "-" + dataObj.getString("roomNum"));
+ } else {
+ row.createCell(1).setCellValue(dataObj.getString("objName"));
+ }
row.createCell(2).setCellValue(dataObj.getString("ownerName"));
row.createCell(3).setCellValue(dataObj.getString("feeTypeCdName"));
row.createCell(4).setCellValue(dataObj.getString("feeName"));
@@ -1101,6 +1136,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 +1325,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 +1616,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 +1634,92 @@
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"));
+ }
+ }
+
+ private void returnPayFeeManage(IPageData pd, ComponentValidateResult result, Workbook workbook) {
+ Sheet sheet = workbook.createSheet("閫�璐瑰鏍歌〃");
+ Row row = sheet.createRow(0);
+ 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(7).setCellValue("瀹炰粯閲戦(鍗曚綅:鍏�)");
+ row.createCell(8).setCellValue("鐢宠鏃堕棿");
+ row.createCell(9).setCellValue("閫�璐瑰師鍥�");
+ row.createCell(10).setCellValue("瀹℃牳鐘舵��");
+ //鏌ヨ妤兼爧淇℃伅
+ JSONArray returnPayFees = this.getReturnPayFeeManage(pd, result);
+ if (returnPayFees == null || returnPayFees.size() == 0) {
+ return;
+ }
+ JSONObject dataObj = null;
+ for (int roomIndex = 0; roomIndex < returnPayFees.size(); roomIndex++) {
+ row = sheet.createRow(roomIndex + 1);
+ dataObj = returnPayFees.getJSONObject(roomIndex);
+ row.createCell(0).setCellValue(roomIndex + 1);
+ row.createCell(1).setCellValue(dataObj.getString("returnFeeId"));
+ row.createCell(2).setCellValue(dataObj.getString("detailId"));
+ row.createCell(3).setCellValue(dataObj.getString("feeTypeCdName"));
+ row.createCell(4).setCellValue(dataObj.getString("payerObjName"));
+ String cycle = dataObj.getString("cycles");
+ if (!StringUtil.isEmpty(cycle) && cycle.contains("-")) {
+ String[] split = cycle.split("-");
+ cycle = split[1];
+ }
+ row.createCell(5).setCellValue(cycle);
+ String receivableAmount = dataObj.getString("receivableAmount");
+ if (!StringUtil.isEmpty(receivableAmount) && receivableAmount.contains("-")) {
+ String[] split = receivableAmount.split("-");
+ receivableAmount = split[1];
+ }
+ row.createCell(6).setCellValue(receivableAmount);
+ String feeAccountDetailDtoList = dataObj.getString("feeAccountDetailDtoList");
+ JSONArray feeAccountDetails = JSONArray.parseArray(feeAccountDetailDtoList);
+ String str = "";
+ if (feeAccountDetails != null && feeAccountDetails.size() > 0) {
+ for (int paramIndex = 0; paramIndex < feeAccountDetails.size(); paramIndex++) {
+ JSONObject param = feeAccountDetails.getJSONObject(paramIndex);
+ //鑾峰彇鎶垫墸绫诲瀷
+ String state = param.getString("state");
+ if (!StringUtil.isEmpty(state) && !state.equals("1001")) {
+ str = param.getString("stateName") + ":" + param.getString("amount") + "; " + str;
+ }
+ }
+ }
+ String payFeeDetailDiscountDtoList = dataObj.getString("payFeeDetailDiscountDtoList");
+ JSONArray payFeeDetailDiscounts = JSONArray.parseArray(payFeeDetailDiscountDtoList);
+ String discount = "";
+ if (payFeeDetailDiscounts != null && payFeeDetailDiscounts.size() > 0) {
+ for (int index = 0; index < payFeeDetailDiscounts.size(); index++) {
+ JSONObject param = payFeeDetailDiscounts.getJSONObject(index);
+ String discountPrice = param.getString("discountPrice");
+ if (!StringUtil.isEmpty(discountPrice) && discountPrice.contains("-")) {
+ String[] split = discountPrice.split("-");
+ discountPrice = split[1];
+ }
+ discount = param.getString("discountName") + ":" + discountPrice + "; " + discount;
+ }
+ }
+ String receivedAmount = dataObj.getString("receivedAmount");
+ if (!StringUtil.isEmpty(receivedAmount) && receivedAmount.contains("-")) {
+ String[] split = receivedAmount.split("-");
+ receivedAmount = split[1];
+ }
+ if(!StringUtil.isEmpty(str) || !StringUtil.isEmpty(discount)) {
+ row.createCell(7).setCellValue(receivedAmount + "(" + str + discount + ")");
+ } else {
+ row.createCell(7).setCellValue(receivedAmount);
+ }
+ row.createCell(8).setCellValue(dataObj.getString("createTime"));
+ row.createCell(9).setCellValue(dataObj.getString("reason"));
+ row.createCell(10).setCellValue(dataObj.getString("stateName"));
}
}
@@ -1630,7 +1752,7 @@
row = sheet.createRow(roomIndex + 1);
dataObj = rooms.getJSONObject(roomIndex);
row.createCell(0).setCellValue(roomIndex + 1);
- row.createCell(1).setCellValue(dataObj.getString("objName"));
+ row.createCell(1).setCellValue(dataObj.getString("objNameNum"));
row.createCell(2).setCellValue(dataObj.getString("ownerName"));
row.createCell(3).setCellValue(dataObj.getString("builtUpArea"));
row.createCell(4).setCellValue(dataObj.getString("feeName"));
@@ -1674,6 +1796,29 @@
return null;
}
return savedRoomInfoResults.getJSONArray("data");
+ }
+
+ private JSONArray getReturnPayFeeManage(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 = "returnPayFee.listReturnPayFees" + mapToUrlParam(reqJson);
+ responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
+ return null;
+ }
+ JSONObject savedReturnPayFeeManages = JSONObject.parseObject(responseEntity.getBody(), Feature.OrderedField);
+ //鑾峰彇闄愬埗鏉℃暟鐨勫��
+ int number = Integer.parseInt(MappingCache.getValue(DOMAIN_COMMON, EXPORT_NUMBER));
+ if (savedReturnPayFeeManages.getJSONArray("returnPayFees").size() > number) {
+ throw new IllegalArgumentException("瀵煎嚭鏁版嵁瓒呰繃闄愬埗鏉℃暟" + number + "鏉★紝鏃犳硶缁х画瀵煎嚭鎿嶄綔锛�");
+ }
+ if (!savedReturnPayFeeManages.containsKey("returnPayFees")) {
+ return null;
+ }
+ return savedReturnPayFeeManages.getJSONArray("returnPayFees");
}
private JSONArray getReportFeeDetail(IPageData pd, ComponentValidateResult result) {
@@ -1857,7 +2002,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = "/reportFeeMonthStatistics/queryReportFeeSummary" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics.queryReportFeeSummary" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
--
Gitblit v1.8.0