From 4dbf61c9189796ec46d39ac4b839cfc064e70411 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 12 八月 2021 16:11:16 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 130 ++++++++++++++++++++++++++++++++++---------
1 files changed, 103 insertions(+), 27 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java
index 8260938..b8dd7a2 100755
--- a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java
@@ -76,6 +76,7 @@
public static final String ALLOCATION_USER_STORE_HOUSE_MANAGE = "allocationUserStorehouseManage";
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";
@Autowired
private RestTemplate restTemplate;
@@ -164,6 +165,9 @@
break;
case RESOURCE_STAFF_FEE_MANAGE:
staffFeeManage(pd, result, workbook);
+ break;
+ case REPORT_PAY_FEE_DEPOSIT:
+ reportPayFeeDeposit(pd, result, workbook);
break;
}
ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -334,19 +338,22 @@
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("鍑忓厤閲戦");
- row.createCell(11).setCellValue("婊炵撼閲�");
- row.createCell(12).setCellValue("绌虹疆鎴挎墦鎶橀噾棰�");
- row.createCell(13).setCellValue("绌虹疆鎴垮噺鍏嶉噾棰�");
- row.createCell(14).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("绌虹疆鎴挎墦鎶橀噾棰�");
+ row.createCell(16).setCellValue("绌虹疆鎴垮噺鍏嶉噾棰�");
+// row.createCell(14).setCellValue("涓氫富");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportPayFeeDetail(pd, result);
if (rooms == null || rooms.size() == 0) {
@@ -358,20 +365,21 @@
dataObj = rooms.getJSONObject(roomIndex);
row.createCell(0).setCellValue(dataObj.getString("oId"));
row.createCell(1).setCellValue(dataObj.getString("objName"));
- row.createCell(2).setCellValue(dataObj.getString("feeName"));
- row.createCell(3).setCellValue(dataObj.getString("primeRate"));
- row.createCell(4).setCellValue(dataObj.getString("startTime"));
- row.createCell(5).setCellValue(dataObj.getString("endTime"));
- row.createCell(6).setCellValue(dataObj.getString("createTime"));
- row.createCell(7).setCellValue(dataObj.getDouble("receivableAmount"));
- row.createCell(8).setCellValue(dataObj.getDouble("receivedAmount"));
- row.createCell(9).setCellValue(dataObj.getDouble("preferentialAmount"));
- row.createCell(10).setCellValue(dataObj.getDouble("deductionAmount"));
- row.createCell(11).setCellValue(dataObj.getDouble("lateFee"));
- row.createCell(12).setCellValue(dataObj.getDouble("vacantHousingDiscount"));
- row.createCell(13).setCellValue(dataObj.getDouble("vacantHousingReduction"));
- row.createCell(14).setCellValue(dataObj.getString("ownerName"));
-
+ row.createCell(2).setCellValue(dataObj.getString("ownerName"));
+ row.createCell(3).setCellValue(dataObj.getString("feeName"));
+ row.createCell(4).setCellValue(dataObj.getString("feeTypeCdName"));
+ row.createCell(5).setCellValue(dataObj.getString("stateName"));
+ row.createCell(6).setCellValue(dataObj.getString("primeRate"));
+ row.createCell(7).setCellValue(dataObj.getString("startTime"));
+ row.createCell(8).setCellValue(dataObj.getString("endTime"));
+ row.createCell(9).setCellValue(dataObj.getString("createTime"));
+ row.createCell(10).setCellValue(dataObj.getDouble("receivableAmount"));
+ 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"));
}
}
@@ -910,6 +918,51 @@
}
}
+ //鎶奸噾鎶ヨ〃瀵煎嚭
+ private void reportPayFeeDeposit(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("浠樻鏂笽D");
+ row.createCell(10).setCellValue("搴旀敹閲戦");
+ row.createCell(11).setCellValue("鐘舵��");
+ row.createCell(12).setCellValue("閫�璐圭姸鎬�");
+ JSONArray reportPayFeeDeposits = this.getReportPayFeeDeposit(pd, result);
+ if (reportPayFeeDeposits == null || reportPayFeeDeposits.size() == 0) {
+ return;
+ }
+ JSONObject dataObj = null;
+ for (int roomIndex = 0; roomIndex < reportPayFeeDeposits.size(); roomIndex++) {
+ row = sheet.createRow(roomIndex + 1);
+ dataObj = reportPayFeeDeposits.getJSONObject(roomIndex);
+ row.createCell(0).setCellValue(dataObj.getString("feeId"));
+ 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"));
+ row.createCell(5).setCellValue(dataObj.getString("startTime"));
+ row.createCell(6).setCellValue(dataObj.getString("deadlineTime"));
+ row.createCell(7).setCellValue(dataObj.getString("createTime"));
+ row.createCell(8).setCellValue(dataObj.getString("payerObjTypeName"));
+ row.createCell(9).setCellValue(dataObj.getString("payerObjId"));
+ row.createCell(10).setCellValue(dataObj.getString("additionalAmount"));
+ row.createCell(11).setCellValue(dataObj.getString("stateName"));
+ if (dataObj.getString("state").equals("2009001")) {
+ row.createCell(12).setCellValue(dataObj.getString("detailStateName"));
+ } else {
+ row.createCell(12).setCellValue("鏈即璐�");
+ }
+ }
+ }
+
private void reportYearCollection(IPageData pd, ComponentValidateResult result, Workbook workbook) {
Sheet sheet = workbook.createSheet("璐圭敤鍙拌处");
@@ -1351,6 +1404,29 @@
return savedStaffFeeManages.getJSONArray("staffFees");
}
+ private JSONArray getReportPayFeeDeposit(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 = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryPayFeeDeposit" + mapToUrlParam(reqJson);
+ responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
+ return null;
+ }
+ JSONObject savedReportPayFeeDeposits = JSONObject.parseObject(responseEntity.getBody(), Feature.OrderedField);
+ //鑾峰彇闄愬埗鏉℃暟鐨勫��
+ int number = Integer.parseInt(MappingCache.getValue(DOMAIN_COMMON, EXPORT_NUMBER));
+ if (savedReportPayFeeDeposits.getJSONArray("data").size() > number) {
+ throw new IllegalArgumentException("瀵煎嚭鏁版嵁瓒呰繃闄愬埗鏉℃暟" + number + "鏉★紝鏃犳硶缁х画瀵煎嚭鎿嶄綔锛�");
+ }
+ if (!savedReportPayFeeDeposits.containsKey("data")) {
+ return null;
+ }
+ return savedReportPayFeeDeposits.getJSONArray("data");
+ }
+
private JSONArray getReportYearCollection(IPageData pd, ComponentValidateResult result) {
String apiUrl = "";
ResponseEntity<String> responseEntity = null;
--
Gitblit v1.8.0