From 093b73aadb022895a02dbbcd64b87613e19b547b Mon Sep 17 00:00:00 2001
From: 1098226878@qq.com <1098226878@qq.com>
Date: 星期一, 10 一月 2022 18:05:21 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 407 +++++++++++++++++++++++++++++++++------------------------
1 files changed, 234 insertions(+), 173 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 82ae1a2..b0ff2a5 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
@@ -4,13 +4,11 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.parser.Feature;
import com.java110.api.smo.DefaultAbstractComponentSMO;
-import com.java110.core.component.BaseComponentSMO;
+import com.java110.api.smo.assetExport.IExportReportFeeSMO;
import com.java110.core.context.IPageData;
import com.java110.dto.fee.FeeConfigDto;
import com.java110.entity.component.ComponentValidateResult;
-import com.java110.api.smo.assetExport.IExportReportFeeSMO;
import com.java110.utils.cache.MappingCache;
-import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
import com.java110.utils.util.StringUtil;
@@ -354,7 +352,8 @@
row.createCell(14).setCellValue("婊炵撼閲�");
row.createCell(15).setCellValue("绌虹疆鎴挎墦鎶橀噾棰�");
row.createCell(16).setCellValue("绌虹疆鎴垮噺鍏嶉噾棰�");
-// row.createCell(14).setCellValue("涓氫富");
+ row.createCell(17).setCellValue("闈㈢Н");
+ row.createCell(18).setCellValue("杞︿綅");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportPayFeeDetail(pd, result);
if (rooms == null || rooms.size() == 0) {
@@ -381,6 +380,8 @@
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"));
}
}
@@ -562,16 +563,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) {
@@ -585,15 +587,16 @@
row.createCell(1).setCellValue(dataObj.getString("userName"));
row.createCell(2).setCellValue(dataObj.getString("endUserName"));
row.createCell(3).setCellValue(dataObj.getString("resOrderTypeName"));
- row.createCell(4).setCellValue(dataObj.getString("rstName"));
+ 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"));
+ 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"));
if (!StringUtil.isEmpty(dataObj.getString("resOrderType")) && dataObj.getString("resOrderType").equals("10000") &&
!StringUtil.isEmpty(dataObj.getString("purchaseQuantity")) && !StringUtil.isEmpty(dataObj.getString("price"))) { //鐘舵�佹槸鍏ュ簱
//鑾峰彇閲囪喘鏁伴噺
@@ -602,13 +605,13 @@
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"));
}
}
@@ -649,15 +652,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) {
@@ -669,22 +673,23 @@
dataObj = allocationStorehouses.getJSONObject(roomIndex);
row.createCell(0).setCellValue(dataObj.getString("applyId"));
row.createCell(1).setCellValue(dataObj.getString("resId"));
- row.createCell(2).setCellValue(dataObj.getString("rstName"));
+ 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"));
}
}
@@ -697,13 +702,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;
@@ -714,26 +720,32 @@
dataObj = resourceStores.getJSONObject(roomIndex);
row.createCell(0).setCellValue(dataObj.getString("resId"));
row.createCell(1).setCellValue(dataObj.getString("shName"));
- row.createCell(2).setCellValue(dataObj.getString("rstName"));
+// row.createCell(2).setCellValue(dataObj.getString("rstName"));
+ if (StringUtil.isEmpty(dataObj.getString("rstName"))) {
+ row.createCell(2).setCellValue(dataObj.getString("parentRstName"));
+ } else {
+ row.createCell(2).setCellValue(dataObj.getString("parentRstName") + ">" + dataObj.getString("rstName"));
+ }
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(dataObj.getString("stock") + 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"));
@@ -744,9 +756,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");
}
}
}
@@ -759,9 +771,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;
@@ -775,15 +788,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"));
}
}
@@ -792,11 +806,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;
@@ -807,18 +822,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("--");
}
}
}
@@ -831,12 +847,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;
@@ -847,15 +864,16 @@
dataObj = allocationUserStorehouses.getJSONObject(roomIndex);
row.createCell(0).setCellValue(dataObj.getString("ausId"));
row.createCell(1).setCellValue(dataObj.getString("resId"));
- row.createCell(2).setCellValue(dataObj.getString("rstName"));
+ 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"));
}
}
@@ -868,12 +886,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;
@@ -885,15 +905,17 @@
row.createCell(0).setCellValue(dataObj.getString("rsurId"));
row.createCell(1).setCellValue(dataObj.getString("repairId"));
row.createCell(2).setCellValue(dataObj.getString("resId"));
- row.createCell(3).setCellValue(dataObj.getString("rstName"));
+ 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"));
}
}
@@ -1010,7 +1032,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportOweFee/queryReportAllOweFee" + mapToUrlParam(reqJson);
+ apiUrl = "/reportOweFee/queryReportAllOweFee" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1028,7 +1050,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryPayFeeDetail" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics/queryPayFeeDetail" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1051,7 +1073,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryRepair" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics/queryRepair" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1077,11 +1099,11 @@
//鑾峰彇璐圭敤绫诲瀷
String payObjType = reqJson.getString("payObjType");
if (!StringUtil.isEmpty(payObjType) && payObjType.equals("3333")) {
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getPropertyPayFee" + mapToUrlParam(reqJson);
+ apiUrl = "api.getPropertyPayFee" + mapToUrlParam(reqJson);
} else if (!StringUtil.isEmpty(payObjType) && payObjType.equals("6666")) {
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getParkingSpacePayFee" + mapToUrlParam(reqJson);
+ apiUrl = "api.getParkingSpacePayFee" + mapToUrlParam(reqJson);
} else {
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getListPayFee" + mapToUrlParam(reqJson);
+ apiUrl = "api.getListPayFee" + mapToUrlParam(reqJson);
}
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
@@ -1105,7 +1127,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportQuestionAnswer/queryUserQuestionAnswerValue" + mapToUrlParam(reqJson);
+ apiUrl = "/reportQuestionAnswer/queryUserQuestionAnswerValue" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1128,7 +1150,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryPrePayment" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics/queryPrePayment" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1151,7 +1173,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryDeadlineFee" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics/queryDeadlineFee" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1174,7 +1196,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryNoFeeRooms" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics/queryNoFeeRooms" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1197,7 +1219,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/purchaseApplyDetail.listPurchaseApplyDetails" + mapToUrlParam(reqJson);
+ apiUrl = "purchaseApplyDetail.listPurchaseApplyDetails" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1221,7 +1243,7 @@
reqJson.put("userId", pd.getUserId());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/resourceStore.listAllocationStorehouseApplys" + mapToUrlParam(reqJson);
+ apiUrl = "resourceStore.listAllocationStorehouseApplys" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1244,7 +1266,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/resourceStore.listAllocationStorehouses" + mapToUrlParam(reqJson);
+ apiUrl = "resourceStore.listAllocationStorehouses" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1273,7 +1295,7 @@
String storeId = result.getStoreId();
reqJson.put("userId", userId);
reqJson.put("storeId", storeId);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/resourceStore.listResourceStores" + mapToUrlParam(reqJson);
+ apiUrl = "resourceStore.listResourceStores" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1296,7 +1318,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/purchaseApply.listPurchaseApplys" + mapToUrlParam(reqJson);
+ apiUrl = "purchaseApply.listPurchaseApplys" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1319,7 +1341,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/purchaseApply.listPurchaseApplys" + mapToUrlParam(reqJson);
+ apiUrl = "purchaseApply.listPurchaseApplys" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1342,7 +1364,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/resourceStore.listAllocationUserStorehouses" + mapToUrlParam(reqJson);
+ apiUrl = "resourceStore.listAllocationUserStorehouses" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1365,7 +1387,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/resourceStore.listResourceStoreUseRecords" + mapToUrlParam(reqJson);
+ apiUrl = "resourceStore.listResourceStoreUseRecords" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1388,7 +1410,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 0);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/api.getStaffFee" + mapToUrlParam(reqJson);
+ apiUrl = "api.getStaffFee" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1411,7 +1433,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryPayFeeDeposit" + mapToUrlParam(reqJson);
+ apiUrl = "reportFeeMonthStatistics/queryPayFeeDeposit" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1434,7 +1456,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10001);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeYearCollection/queryReportFeeYear" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeYearCollection/queryReportFeeYear" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1456,10 +1478,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(2).setCellValue("涓氫富");
+ row.createCell(3).setCellValue("闈㈢Н");
+ row.createCell(4).setCellValue("璐圭敤椤�");
+ row.createCell(5).setCellValue("璐圭敤寮�濮嬫椂闂�");
+ row.createCell(6).setCellValue("娆犺垂鏃堕暱锛堝ぉ锛�");
+ row.createCell(7).setCellValue("娆犺垂閲戦");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportOweFeeDetail(pd, result);
if (rooms == null || rooms.size() == 0) {
@@ -1471,10 +1495,12 @@
dataObj = rooms.getJSONObject(roomIndex);
row.createCell(0).setCellValue(roomIndex + 1);
row.createCell(1).setCellValue(dataObj.getString("objName"));
- row.createCell(2).setCellValue(dataObj.getString("feeName"));
- row.createCell(3).setCellValue(dataObj.getString("feeCreateTime"));
- row.createCell(4).setCellValue(dataObj.getString("oweDay"));
- row.createCell(5).setCellValue(dataObj.getString("oweAmount"));
+ 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"));
}
}
@@ -1483,11 +1509,13 @@
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("搴旀敹閲戦");
+ row.createCell(8).setCellValue("瀹炴敹閲戦");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFeeDetail(pd, result);
if (rooms == null || rooms.size() == 0) {
@@ -1499,11 +1527,13 @@
dataObj = rooms.getJSONObject(roomIndex);
row.createCell(0).setCellValue(roomIndex + 1);
row.createCell(1).setCellValue(dataObj.getString("objName"));
- row.createCell(2).setCellValue(dataObj.getString("feeName"));
- row.createCell(3).setCellValue(dataObj.getString("feeCreateTime"));
- row.createCell(4).setCellValue(dataObj.getString("deadlineTime"));
- row.createCell(5).setCellValue(dataObj.getString("receivableAmount"));
- row.createCell(6).setCellValue(dataObj.getString("receivedAmount"));
+ 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"));
}
}
@@ -1513,7 +1543,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryOweFeeDetail" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics/queryOweFeeDetail" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1536,7 +1566,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryFeeDetail" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics/queryFeeDetail" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1559,26 +1589,35 @@
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("娆犺垂閲戦(鍗曚綅:鍏�)");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFeeBreakdown(pd, result);
if (rooms == null || rooms.size() == 0) {
return;
}
JSONObject dataObj = null;
+ BigDecimal oweFeeDec = 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("feeTypeCd"));
row.createCell(2).setCellValue(dataObj.getString("feeName"));
- row.createCell(3).setCellValue(dataObj.getString("feeCreateTime"));
- row.createCell(4).setCellValue(dataObj.getString("receivableAmount"));
- row.createCell(5).setCellValue(dataObj.getString("receivedAmount"));
- row.createCell(6).setCellValue(dataObj.getString("oweAmount"));
+ 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"));
+ 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() + "");
}
}
@@ -1588,7 +1627,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryFeeBreakdown" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics/queryFeeBreakdown" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1611,24 +1650,35 @@
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(3).setCellValue("鍘嗗彶娆犺垂(鍗曚綅:鍏�)");
+ row.createCell(4).setCellValue("褰撴湀搴旀敹(鍗曚綅:鍏�)");
+ row.createCell(5).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
+ row.createCell(6).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
+ row.createCell(7).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
+ row.createCell(8).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFloorUnitFeeSummary(pd, result);
if (rooms == null || rooms.size() == 0) {
return;
}
JSONObject dataObj = null;
+ BigDecimal oweFeeDec = null;
for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
row = sheet.createRow(roomIndex + 1);
dataObj = rooms.getJSONObject(roomIndex);
row.createCell(0).setCellValue(dataObj.getString("feeYear") + "骞�" + dataObj.getString("feeMonth") + "鏈�");
row.createCell(1).setCellValue(dataObj.getString("floorNum") + "鏍�");
row.createCell(2).setCellValue(dataObj.getString("unitNum") + "鍗曞厓");
- row.createCell(3).setCellValue(dataObj.getString("receivableAmount"));
- row.createCell(4).setCellValue(dataObj.getString("receivedAmount"));
- row.createCell(5).setCellValue(dataObj.getString("oweAmount"));
+ 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"));
+ 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() + "");
}
}
@@ -1638,7 +1688,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryFloorUnitFeeSummary" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics/queryFloorUnitFeeSummary" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1669,7 +1719,7 @@
JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
reqJson.put("page", 1);
reqJson.put("row", 10000);
- apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryReportFeeSummary" + mapToUrlParam(reqJson);
+ apiUrl = "/reportFeeMonthStatistics/queryReportFeeSummary" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
@@ -1696,22 +1746,33 @@
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(1).setCellValue("鍘嗗彶娆犺垂(鍗曚綅:鍏�)");
+ row.createCell(2).setCellValue("褰撴湀搴旀敹(鍗曚綅:鍏�)");
+ row.createCell(3).setCellValue("褰撴湀瀹炴敹(鍗曚綅:鍏�)");
+ row.createCell(4).setCellValue("娆犺垂杩藉洖(鍗曚綅:鍏�)");
+ row.createCell(5).setCellValue("棰勪氦璐圭敤(鍗曚綅:鍏�)");
+ row.createCell(6).setCellValue("娆犺垂閲戦(鍗曚綅:鍏�)");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFeeSummaryFee(pd, componentValidateResult);
if (rooms == null || rooms.size() == 0) {
return;
}
JSONObject dataObj = null;
+ BigDecimal oweFeeDec = null;
for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
row = sheet.createRow(roomIndex + 1);
dataObj = rooms.getJSONObject(roomIndex);
row.createCell(0).setCellValue(dataObj.getString("feeYear") + "骞�" + dataObj.getString("feeMonth") + "鏈�");
- row.createCell(1).setCellValue(dataObj.getString("receivableAmount"));
- row.createCell(2).setCellValue(dataObj.getString("receivedAmount"));
- row.createCell(3).setCellValue(dataObj.getString("oweAmount"));
+ 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"));
+ 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() + "");
}
}
--
Gitblit v1.8.0