From 979ddae1450771e1546e7adca7ad9916f51215be Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 05 二月 2025 19:10:30 +0800
Subject: [PATCH] 优化报表支持按时间段
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 677 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 501 insertions(+), 176 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 53ad980..901de20 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
@@ -6,18 +6,19 @@
import com.java110.api.smo.DefaultAbstractComponentSMO;
import com.java110.api.smo.assetExport.IExportReportFeeSMO;
import com.java110.core.context.IPageData;
+import com.java110.core.log.LoggerFactory;
import com.java110.dto.fee.FeeConfigDto;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.system.ComponentValidateResult;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.ListUtil;
import com.java110.utils.util.StringUtil;
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.usermodel.XSSFWorkbook;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -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";
@@ -76,7 +79,8 @@
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";
+ public static final String EXPORT_EXCEL = "exportExcel";
@Autowired
private RestTemplate restTemplate;
@@ -84,14 +88,26 @@
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");
@@ -104,6 +120,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);
@@ -168,6 +187,9 @@
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();
@@ -192,6 +214,7 @@
return new ResponseEntity<Object>(context, headers, HttpStatus.OK);
}
+
private void reportListOweFee(IPageData pd, ComponentValidateResult result, Workbook workbook) {
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
String configIds = reqJson.getString("configIds");
@@ -206,15 +229,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 +248,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));
}
}
@@ -349,10 +374,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(14).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) {
@@ -363,7 +390,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"));
@@ -376,9 +407,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(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"));
}
}
@@ -482,7 +516,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("璺濈璐圭敤寮�濮嬫椂闂达紙澶╋級");
@@ -495,7 +529,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"));
@@ -505,7 +543,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("璺濈璐圭敤缁撴潫鏃堕棿锛堝ぉ锛�");
@@ -560,16 +598,17 @@
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(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(17).setCellValue("鍒涘缓鏃堕棿");
JSONArray purchaseApplyDetails = this.getPurchaseApplyDetail(pd, result);
if (purchaseApplyDetails == null || purchaseApplyDetails.size() == 0) {
@@ -586,27 +625,28 @@
row.createCell(4).setCellValue(dataObj.getString("parentRstName") + ">" + dataObj.getString("rstName"));
row.createCell(5).setCellValue(dataObj.getString("resName"));
row.createCell(6).setCellValue(dataObj.getString("specName"));
- row.createCell(7).setCellValue(dataObj.getString("supplierName"));
- row.createCell(8).setCellValue(dataObj.getString("shName"));
- row.createCell(9).setCellValue(dataObj.getString("warehousingWayName") + dataObj.getString("resOrderTypeName"));
- row.createCell(10).setCellValue(dataObj.getString("quantity") + dataObj.getString("unitCodeName"));
- row.createCell(11).setCellValue(dataObj.getString("purchaseQuantity") + dataObj.getString("unitCodeName"));
- row.createCell(12).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"))) { //鐘舵�佹槸鍏ュ簱
+ row.createCell(7).setCellValue(dataObj.getString("isFixedName"));
+ row.createCell(8).setCellValue(dataObj.getString("supplierName"));
+ row.createCell(9).setCellValue(dataObj.getString("shName"));
+ row.createCell(10).setCellValue(dataObj.getString("warehousingWayName") + dataObj.getString("resOrderTypeName"));
+ 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"));
+ //!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"));
//鑾峰彇閲囪喘鍗曚环
double price = Double.parseDouble(dataObj.getString("price"));
//鑾峰彇閲囪喘鎬讳环
double totalPrice = purchaseQuantity * price;
- row.createCell(13).setCellValue(String.valueOf(totalPrice));
+ row.createCell(14).setCellValue(String.valueOf(totalPrice));
} else {
- row.createCell(13).setCellValue("--");
+ row.createCell(14).setCellValue("--");
}
- row.createCell(14).setCellValue(dataObj.getString("remark"));
- row.createCell(15).setCellValue(dataObj.getString("stateName"));
- row.createCell(16).setCellValue(dataObj.getString("createTime"));
+ row.createCell(15).setCellValue(dataObj.getString("remark"));
+ row.createCell(16).setCellValue(dataObj.getString("stateName"));
+ row.createCell(17).setCellValue(dataObj.getString("createTime"));
}
}
@@ -647,15 +687,16 @@
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("鐘舵��");
- row.createCell(13).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("鐢宠浜篒D");
+ row.createCell(11).setCellValue("鐢宠浜�");
+ row.createCell(12).setCellValue("璋冩嫧璇存槑");
+ row.createCell(13).setCellValue("鐘舵��");
+ row.createCell(14).setCellValue("鏃堕棿");
JSONArray allocationStorehouses = this.getAllocationStorehouseDetail(pd, result);
if (allocationStorehouses == null || allocationStorehouses.size() == 0) {
@@ -670,19 +711,20 @@
row.createCell(2).setCellValue(dataObj.getString("parentRstName") + ">" + dataObj.getString("rstName"));
row.createCell(3).setCellValue(dataObj.getString("resName"));
row.createCell(4).setCellValue(dataObj.getString("specName"));
- row.createCell(5).setCellValue(dataObj.getString("originalStock") + dataObj.getString("unitCodeName"));
- row.createCell(6).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
+ row.createCell(5).setCellValue(dataObj.getString("isFixedName"));
+ row.createCell(6).setCellValue(dataObj.getString("originalStock") + dataObj.getString("unitCodeName"));
+ row.createCell(7).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
if (!StringUtil.isEmpty(dataObj.getString("applyType")) && dataObj.getString("applyType").equals("20000")) { //杩旇繕
- row.createCell(7).setCellValue(dataObj.getString("startUserName"));
+ row.createCell(8).setCellValue(dataObj.getString("startUserName"));
} else {
- row.createCell(7).setCellValue(dataObj.getString("shaName"));
+ row.createCell(8).setCellValue(dataObj.getString("shaName"));
}
- row.createCell(8).setCellValue(dataObj.getString("shzName"));
- row.createCell(9).setCellValue(dataObj.getString("startUserId"));
- row.createCell(10).setCellValue(dataObj.getString("startUserName"));
- row.createCell(11).setCellValue(dataObj.getString("remark"));
- row.createCell(12).setCellValue(dataObj.getString("stateName"));
- row.createCell(13).setCellValue(dataObj.getString("createTime"));
+ row.createCell(9).setCellValue(dataObj.getString("shzName"));
+ row.createCell(10).setCellValue(dataObj.getString("startUserId"));
+ row.createCell(11).setCellValue(dataObj.getString("startUserName"));
+ row.createCell(12).setCellValue(dataObj.getString("remark"));
+ row.createCell(13).setCellValue(dataObj.getString("stateName"));
+ row.createCell(14).setCellValue(dataObj.getString("createTime"));
}
}
@@ -695,13 +737,14 @@
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(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("鐗╁搧鎬讳环");
JSONArray resourceStores = this.getResourceStore(pd, result);
if (resourceStores == null || resourceStores.size() == 0) {
return;
@@ -721,22 +764,23 @@
row.createCell(3).setCellValue(dataObj.getString("resName"));
row.createCell(4).setCellValue(dataObj.getString("rssName"));
row.createCell(5).setCellValue(dataObj.getString("resCode"));
- row.createCell(6).setCellValue(dataObj.getString("price"));
+ row.createCell(6).setCellValue(dataObj.getString("isFixedName"));
+ row.createCell(7).setCellValue(dataObj.getString("price"));
//鑾峰彇鏈�浣庝环
String outLowPrice = dataObj.getString("outLowPrice");
//鑾峰彇鏈�楂樹环
String outHighPrice = dataObj.getString("outHighPrice");
if (!StringUtil.isEmpty(outLowPrice) && !StringUtil.isEmpty(outHighPrice) && outLowPrice.equals(outHighPrice)) {
- row.createCell(7).setCellValue(outLowPrice);
+ row.createCell(8).setCellValue(outLowPrice);
} else if (!StringUtil.isEmpty(outLowPrice) && !StringUtil.isEmpty(outHighPrice) && !outLowPrice.equals(outHighPrice)) {
- row.createCell(7).setCellValue(dataObj.getString("outLowPrice") + "-" + dataObj.getString("outHighPrice"));
+ row.createCell(8).setCellValue(dataObj.getString("outLowPrice") + "-" + dataObj.getString("outHighPrice"));
} else {
- row.createCell(7).setCellValue("--");
+ row.createCell(8).setCellValue("--");
}
- row.createCell(8).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
- row.createCell(9).setCellValue("1" + dataObj.getString("unitCodeName") + "=" + dataObj.getString("miniUnitStock") + dataObj.getString("miniUnitCodeName"));
- row.createCell(10).setCellValue(dataObj.getString("miniStock") + dataObj.getString("miniUnitCodeName"));
- row.createCell(11).setCellValue(dataObj.getString("averagePrice"));
+ row.createCell(9).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
+ row.createCell(10).setCellValue("1" + dataObj.getString("unitCodeName") + "=" + dataObj.getString("miniUnitStock") + dataObj.getString("miniUnitCodeName"));
+ row.createCell(11).setCellValue(dataObj.getString("miniStock") + dataObj.getString("miniUnitCodeName"));
+ row.createCell(12).setCellValue(dataObj.getString("averagePrice"));
if (!StringUtil.isEmpty(dataObj.getString("stock")) && !StringUtil.isEmpty(dataObj.getString("averagePrice"))) {
//鑾峰彇鐗╁搧搴撳瓨鏁伴噺
double stock = Double.parseDouble(dataObj.getString("stock"));
@@ -747,9 +791,9 @@
//璁＄畻鐗╁搧鎬讳环
BigDecimal price = x1.multiply(y1);
double totalPrice = price.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
- row.createCell(12).setCellValue(String.valueOf(totalPrice));
+ row.createCell(13).setCellValue(String.valueOf(totalPrice));
} else {
- row.createCell(12).setCellValue("0.0");
+ row.createCell(13).setCellValue("0.0");
}
}
}
@@ -762,9 +806,10 @@
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(5).setCellValue("鏄惁鏄浐瀹氱墿鍝�");
+ row.createCell(6).setCellValue("鐢宠鏃堕棿");
+ row.createCell(7).setCellValue("閲囪喘鏂瑰紡");
+ row.createCell(8).setCellValue("瀹℃壒鐘舵��");
JSONArray purchaseApplys = this.getPurchaseApply(pd, result);
if (purchaseApplys == null || purchaseApplys.size() == 0) {
return;
@@ -778,15 +823,16 @@
row.createCell(2).setCellValue(dataObj.getString("endUserName"));
row.createCell(3).setCellValue(dataObj.getString("createUserName"));
row.createCell(4).setCellValue(dataObj.getString("resourceNames"));
- row.createCell(5).setCellValue(dataObj.getString("createTime"));
+ row.createCell(5).setCellValue(dataObj.getString("isFixedName"));
+ row.createCell(6).setCellValue(dataObj.getString("createTime"));
//鑾峰彇鍏ュ簱鏂瑰紡
String warehousingWay = dataObj.getString("warehousingWay");
if (!StringUtil.isEmpty(warehousingWay) && warehousingWay.equals("10000")) {
- row.createCell(6).setCellValue("鐩存帴鍏ュ簱");
+ row.createCell(7).setCellValue("鐩存帴鍏ュ簱");
} else {
- row.createCell(6).setCellValue("閲囪喘鐢宠鍏ュ簱");
+ row.createCell(7).setCellValue("閲囪喘鐢宠鍏ュ簱");
}
- row.createCell(7).setCellValue(dataObj.getString("stateName"));
+ row.createCell(8).setCellValue(dataObj.getString("stateName"));
}
}
@@ -795,11 +841,12 @@
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(2).setCellValue("鏄惁鏄浐瀹氱墿鍝�");
+ row.createCell(3).setCellValue("鐢宠浜�");
+ row.createCell(4).setCellValue("鎿嶄綔浜�");
+ row.createCell(5).setCellValue("鐢宠鏃堕棿");
+ row.createCell(6).setCellValue("鐘舵��");
+ row.createCell(7).setCellValue("棰嗙敤鏂瑰紡");
JSONArray itemOutManages = this.getItemOutManage(pd, result);
if (itemOutManages == null || itemOutManages.size() == 0) {
return;
@@ -810,18 +857,19 @@
dataObj = itemOutManages.getJSONObject(roomIndex);
row.createCell(0).setCellValue(dataObj.getString("applyOrderId"));
row.createCell(1).setCellValue(dataObj.getString("resourceNames"));
- row.createCell(2).setCellValue(dataObj.getString("userName"));
- row.createCell(3).setCellValue(dataObj.getString("createUserName"));
- row.createCell(4).setCellValue(dataObj.getString("createTime"));
- row.createCell(5).setCellValue(dataObj.getString("stateName"));
+ row.createCell(2).setCellValue(dataObj.getString("isFixedName"));
+ row.createCell(3).setCellValue(dataObj.getString("userName"));
+ row.createCell(4).setCellValue(dataObj.getString("createUserName"));
+ row.createCell(5).setCellValue(dataObj.getString("createTime"));
+ row.createCell(6).setCellValue(dataObj.getString("stateName"));
//鑾峰彇鍑哄簱鏂瑰紡
String warehousingWay = dataObj.getString("warehousingWay");
if (!StringUtil.isEmpty(warehousingWay) && warehousingWay.equals("10000")) {
- row.createCell(6).setCellValue("鐩存帴鍑哄簱");
+ row.createCell(7).setCellValue("鐩存帴鍑哄簱");
} else if (!StringUtil.isEmpty(warehousingWay) && warehousingWay.equals("20000")) {
- row.createCell(6).setCellValue("瀹℃牳鍑哄簱");
+ row.createCell(7).setCellValue("瀹℃牳鍑哄簱");
} else {
- row.createCell(6).setCellValue("--");
+ row.createCell(7).setCellValue("--");
}
}
}
@@ -834,12 +882,13 @@
row.createCell(2).setCellValue("鐗╁搧绫诲瀷");
row.createCell(3).setCellValue("鐗╁搧鍚嶇О");
row.createCell(4).setCellValue("鐗╁搧瑙勬牸");
- row.createCell(5).setCellValue("杞禒瀵硅薄ID");
- row.createCell(6).setCellValue("杞禒瀵硅薄");
- row.createCell(7).setCellValue("鍘熸湁搴撳瓨");
- row.createCell(8).setCellValue("杞禒鏁伴噺");
- row.createCell(9).setCellValue("鍒涘缓鏃堕棿");
- row.createCell(10).setCellValue("澶囨敞");
+ row.createCell(5).setCellValue("鏄惁鏄浐瀹氱墿鍝�");
+ row.createCell(6).setCellValue("杞禒瀵硅薄ID");
+ row.createCell(7).setCellValue("杞禒瀵硅薄");
+ row.createCell(8).setCellValue("鍘熸湁搴撳瓨");
+ row.createCell(9).setCellValue("杞禒鏁伴噺");
+ row.createCell(10).setCellValue("鍒涘缓鏃堕棿");
+ row.createCell(11).setCellValue("澶囨敞");
JSONArray allocationUserStorehouses = this.getAllocationUserStorehouseManage(pd, result);
if (allocationUserStorehouses == null || allocationUserStorehouses.size() == 0) {
return;
@@ -853,14 +902,82 @@
row.createCell(2).setCellValue(dataObj.getString("parentRstName") + ">" + dataObj.getString("rstName"));
row.createCell(3).setCellValue(dataObj.getString("resName"));
row.createCell(4).setCellValue(dataObj.getString("specName"));
- row.createCell(5).setCellValue(dataObj.getString("acceptUserId"));
- row.createCell(6).setCellValue(dataObj.getString("acceptUserName"));
- row.createCell(7).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
- row.createCell(8).setCellValue(dataObj.getString("giveQuantity") + dataObj.getString("miniUnitCodeName"));
- row.createCell(9).setCellValue(dataObj.getString("createTime"));
- row.createCell(10).setCellValue(dataObj.getString("remark"));
+ row.createCell(5).setCellValue(dataObj.getString("isFixedName"));
+ row.createCell(6).setCellValue(dataObj.getString("acceptUserId"));
+ row.createCell(7).setCellValue(dataObj.getString("acceptUserName"));
+ row.createCell(8).setCellValue(dataObj.getString("stock") + dataObj.getString("unitCodeName"));
+ row.createCell(9).setCellValue(dataObj.getString("giveQuantity") + dataObj.getString("miniUnitCodeName"));
+ row.createCell(10).setCellValue(dataObj.getString("createTime"));
+ row.createCell(11).setCellValue(dataObj.getString("remark"));
}
}
+
+ 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("鐗╁搧浣跨敤璁板綍");
@@ -871,12 +988,14 @@
row.createCell(3).setCellValue("鐗╁搧绫诲瀷");
row.createCell(4).setCellValue("鐗╁搧鍚嶇О");
row.createCell(5).setCellValue("鐗╁搧瑙勬牸");
- row.createCell(6).setCellValue("鐗╁搧浣跨敤鏁伴噺");
- row.createCell(7).setCellValue("鐗╁搧浠锋牸");
- row.createCell(8).setCellValue("浣跨敤浜篒D");
- row.createCell(9).setCellValue("浣跨敤浜�");
- row.createCell(10).setCellValue("鍒涘缓鏃堕棿");
- row.createCell(11).setCellValue("澶囨敞");
+ row.createCell(6).setCellValue("鏄惁鏄浐瀹氱墿鍝�");
+ row.createCell(7).setCellValue("鐗╁搧浣跨敤绫诲瀷");
+ row.createCell(8).setCellValue("鐗╁搧浣跨敤鏁伴噺");
+ row.createCell(9).setCellValue("鐗╁搧浠锋牸");
+ row.createCell(10).setCellValue("浣跨敤浜篒D");
+ row.createCell(11).setCellValue("浣跨敤浜�");
+ row.createCell(12).setCellValue("鍒涘缓鏃堕棿");
+ row.createCell(13).setCellValue("澶囨敞");
JSONArray resourceStoreUseRecords = this.getResourceStoreUseRecordManage(pd, result);
if (resourceStoreUseRecords == null || resourceStoreUseRecords.size() == 0) {
return;
@@ -891,12 +1010,14 @@
row.createCell(3).setCellValue(dataObj.getString("parentRstName") + ">" + dataObj.getString("rstName"));
row.createCell(4).setCellValue(dataObj.getString("resourceStoreName"));
row.createCell(5).setCellValue(dataObj.getString("specName"));
- row.createCell(6).setCellValue(dataObj.getString("quantity") + dataObj.getString("miniUnitCodeName"));
- row.createCell(7).setCellValue(dataObj.getString("unitPrice"));
- row.createCell(8).setCellValue(dataObj.getString("createUserId"));
- row.createCell(9).setCellValue(dataObj.getString("createUserName"));
- row.createCell(10).setCellValue(dataObj.getString("createTime"));
- row.createCell(11).setCellValue(dataObj.getString("remark"));
+ row.createCell(6).setCellValue(dataObj.getString("isFixedName"));
+ row.createCell(7).setCellValue(dataObj.getString("stateName"));
+ row.createCell(8).setCellValue(dataObj.getString("quantity") + dataObj.getString("miniUnitCodeName"));
+ row.createCell(9).setCellValue(dataObj.getString("unitPrice"));
+ row.createCell(10).setCellValue(dataObj.getString("createUserId"));
+ row.createCell(11).setCellValue(dataObj.getString("createUserName"));
+ row.createCell(12).setCellValue(dataObj.getString("createTime"));
+ row.createCell(13).setCellValue(dataObj.getString("remark"));
}
}
@@ -948,7 +1069,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"));
@@ -1013,6 +1138,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) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
@@ -1106,6 +1232,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);
@@ -1131,7 +1258,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = "/reportFeeMonthStatistics/queryPrePayment" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics.queryPrePayment" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1154,7 +1281,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = "/reportFeeMonthStatistics/queryDeadlineFee" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics.queryDeadlineFee" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1200,6 +1327,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) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
@@ -1283,7 +1411,11 @@
}
JSONObject savedResourceStores = JSONObject.parseObject(responseEntity.getBody(), Feature.OrderedField);
//鑾峰彇闄愬埗鏉℃暟鐨勫��
- int number = Integer.parseInt(MappingCache.getValue(DOMAIN_COMMON, EXPORT_NUMBER));
+ String exportNumber = MappingCache.getValue(DOMAIN_COMMON, EXPORT_NUMBER);
+ if (!StringUtil.isNumber(exportNumber)) {
+ exportNumber = "10000";
+ }
+ int number = Integer.parseInt(exportNumber);
if (savedResourceStores.getJSONArray("resourceStores").size() > number) {
throw new IllegalArgumentException("瀵煎嚭鏁版嵁瓒呰繃闄愬埗鏉℃暟" + number + "鏉★紝鏃犳硶缁х画瀵煎嚭鎿嶄綔锛�");
}
@@ -1362,6 +1494,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;
@@ -1414,7 +1569,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;
@@ -1460,28 +1615,121 @@
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(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.getReportOweFeeDetail(pd, result);
- if (rooms == null || rooms.size() == 0) {
+ if (ListUtil.isNull(rooms)) {
return;
}
JSONObject dataObj = null;
+ BigDecimal monthDec = null;
for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
row = sheet.createRow(roomIndex + 1);
dataObj = rooms.getJSONObject(roomIndex);
row.createCell(0).setCellValue(roomIndex + 1);
row.createCell(1).setCellValue(dataObj.getString("objName"));
row.createCell(2).setCellValue(dataObj.getString("ownerName"));
- 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(3).setCellValue(dataObj.getString("ownerTel"));
+ row.createCell(4).setCellValue(dataObj.getString("builtUpArea"));
+ row.createCell(5).setCellValue(dataObj.getString("feeName"));
+ row.createCell(6).setCellValue(dataObj.getString("startTime"));
+ row.createCell(7).setCellValue(dataObj.getString("endTime"));
+ row.createCell(8).setCellValue(dataObj.getString("oweDay"));
+ monthDec = new BigDecimal(dataObj.getString("oweDay"));
+ monthDec = monthDec.divide(new BigDecimal("30"), 2, BigDecimal.ROUND_HALF_UP);
+ row.createCell(9).setCellValue(monthDec.doubleValue());
+ row.createCell(10).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"));
}
}
@@ -1495,8 +1743,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) {
@@ -1507,14 +1762,26 @@
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"));
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"));
}
}
@@ -1539,6 +1806,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) {
@@ -1572,10 +1862,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) {
@@ -1591,14 +1884,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"));
}
}
@@ -1633,10 +1934,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) {
@@ -1652,14 +1956,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"));
}
}
@@ -1700,7 +2012,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;
@@ -1729,10 +2041,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) {
@@ -1746,14 +2062,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