From 6bf8b48e9d689ab90864bc2ee0e6ebeae3a4c1fa Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 04 八月 2022 10:06:47 +0800
Subject: [PATCH] 1.优化报表缴费明细统计问题2、优化调查问卷投票问题3、优化投诉咨询问题3、优化业主新增用户联系地址4、增加定时任务根据身份证号自动更新年龄5、优化缴费清单
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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 0b6edfb..53d3ddf 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
@@ -369,7 +369,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"));
@@ -503,7 +507,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"));
@@ -526,7 +534,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"));
@@ -1038,7 +1046,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"));
@@ -1292,7 +1304,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- reqJson.put("storeId",result.getStoreId());
+ reqJson.put("storeId", result.getStoreId());
apiUrl = "purchaseApplyDetail.listPurchaseApplyDetails" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
@@ -1636,7 +1648,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"));
--
Gitblit v1.8.0