From 74be20dfb5b244bbae3387db7a1aecb9fc1a21bd Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: 星期三, 16 六月 2021 18:22:03 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java | 360 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 270 insertions(+), 90 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java
old mode 100644
new mode 100755
index 14b8836..c97443f
--- a/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/assetExport/impl/ExportReportFeeSMOImpl.java
@@ -5,11 +5,13 @@
import com.alibaba.fastjson.parser.Feature;
import com.java110.core.component.BaseComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.dto.fee.FeeConfigDto;
import com.java110.entity.component.ComponentValidateResult;
import com.java110.front.smo.assetExport.IExportReportFeeSMO;
import com.java110.utils.constant.ServiceConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
+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;
@@ -27,6 +29,9 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
/**
* @ClassName AssetImportSmoImpl
@@ -39,13 +44,14 @@
@Service("exportReportFeeSMOImpl")
public class ExportReportFeeSMOImpl extends BaseComponentSMO implements IExportReportFeeSMO {
private final static Logger logger = LoggerFactory.getLogger(ExportReportFeeSMOImpl.class);
-
public static final String REPORT_FEE_SUMMARY = "reportFeeSummary";
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_OWE_FEE_DETAIL = "reportOweFeeDetail";
public static final String REPORT_PAY_FEE_DETAIL = "reportPayFeeDetail";
+ public static final String REPORT_YEAR_COLLECTION = "reportYearCollection";
+ public static final String REPORT_LIST_OWE_FEE = "listOweFee";
@Autowired
private RestTemplate restTemplate;
@@ -84,10 +90,13 @@
case REPORT_PAY_FEE_DETAIL:
reportPayFeeDetail(pd, result, workbook);
break;
-
+ case REPORT_YEAR_COLLECTION:
+ reportYearCollection(pd, result, workbook);
+ break;
+ case REPORT_LIST_OWE_FEE:
+ reportListOweFee(pd, result, workbook);
+ break;
}
-
-
ByteArrayOutputStream os = new ByteArrayOutputStream();
MultiValueMap headers = new HttpHeaders();
headers.add("content-type", "application/octet-stream;charset=UTF-8");
@@ -111,36 +120,247 @@
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");
+ //鏌ヨ妤兼爧淇℃伅
+ JSONArray oweFees = this.getReportListOweFees(pd, result);
+ if (oweFees == null) {
+ return;
+ }
+ //鑾峰彇璐圭敤椤�
+ List<FeeConfigDto> feeConfigDtos = getFeeConfigs(oweFees);
+ 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("缁撴潫鏃堕棿");
+ if (!StringUtil.isEmpty(configIds)) {
+ for (int feeConfigIndex = 0; feeConfigIndex < feeConfigDtos.size(); feeConfigIndex++) {
+ row.createCell(4 + feeConfigIndex).setCellValue(feeConfigDtos.get(feeConfigIndex).getFeeName());
+ }
+ row.createCell(4 + feeConfigDtos.size()).setCellValue("鍚堣");
+ } else {
+ row.createCell(4).setCellValue("鍚堣");
+ }
+
+
+ JSONObject dataObj = null;
+ for (int roomIndex = 0; roomIndex < oweFees.size(); roomIndex++) {
+ row = sheet.createRow(roomIndex + 1);
+ 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"));
+ if (!StringUtil.isEmpty(configIds)) {
+ for (int feeConfigIndex = 0; feeConfigIndex < feeConfigDtos.size(); feeConfigIndex++) {
+ row.createCell(4 + feeConfigIndex).setCellValue(getFeeConfigAmount(feeConfigDtos.get(feeConfigIndex), dataObj));
+ }
+ row.createCell(4 + feeConfigDtos.size()).setCellValue(getAllFeeOweAmount(feeConfigDtos, dataObj));
+ } else {
+ row.createCell(4).setCellValue(getAllFeeOweAmount(feeConfigDtos, dataObj));
+ }
+
+ }
+ }
+
+ /**
+ * _getAllFeeOweAmount: function (_fee) {
+ * let _feeConfigNames = $that.listOweFeeInfo.feeConfigNames;
+ * if (_feeConfigNames.length < 1) {
+ * return _fee.amountOwed;
+ * }
+ * <p>
+ * let _amountOwed = 0.0;
+ * let _items = _fee.items;
+ * _feeConfigNames.forEach(_feeItem =>{
+ * _items.forEach(_item=>{
+ * if(_feeItem.configId == _item.configId){
+ * _amountOwed += parseFloat(_item.amountOwed);
+ * }
+ * })
+ * })
+ * return _amountOwed;
+ * }
+ *
+ * @param dataObj
+ * @return
+ */
+ private double getAllFeeOweAmount(List<FeeConfigDto> feeConfigDtos, JSONObject dataObj) {
+ if (feeConfigDtos == null || feeConfigDtos.size() < 1) {
+ return dataObj.getDouble("amountOwed");
+ }
+ JSONArray items = dataObj.getJSONArray("items");
+ if (items == null || items.size() < 1) {
+ return dataObj.getDouble("amountOwed");
+ }
+
+ BigDecimal oweAmount = new BigDecimal(0);
+ for (FeeConfigDto feeConfigDto : feeConfigDtos) {
+ for (int itemIndex = 0; itemIndex < items.size(); itemIndex++) {
+ if (feeConfigDto.getConfigId().equals(items.getJSONObject(itemIndex).getString("configId"))) {
+ oweAmount = oweAmount.add(new BigDecimal(items.getJSONObject(itemIndex).getDouble("amountOwed")));
+ }
+ }
+ }
+
+ return oweAmount.doubleValue();
+ }
+
+ private double getFeeConfigAmount(FeeConfigDto feeConfigDto, JSONObject dataObj) {
+ JSONArray items = dataObj.getJSONArray("items");
+ double oweAmount = 0;
+
+ if (items == null || items.size() < 1) {
+ return oweAmount;
+ }
+
+ for (int itemIndex = 0; itemIndex < items.size(); itemIndex++) {
+ if (feeConfigDto.getConfigId().equals(items.getJSONObject(itemIndex).getString("configId"))) {
+ oweAmount = items.getJSONObject(itemIndex).getDouble("amountOwed");
+ break;
+ }
+ }
+ return oweAmount;
+ }
+
+
+ private List<FeeConfigDto> getFeeConfigs(JSONArray oweFees) {
+ List<FeeConfigDto> feeConfigDtos = new ArrayList<>();
+ FeeConfigDto feeConfigDto = null;
+ for (int oweFeeIndex = 0; oweFeeIndex < oweFees.size(); oweFeeIndex++) {
+ JSONArray items = oweFees.getJSONObject(oweFeeIndex).getJSONArray("items");
+ for (int itemIndex = 0; itemIndex < items.size(); itemIndex++) {
+ if (existsFeeConfig(feeConfigDtos, items.getJSONObject(itemIndex))) {
+ continue;
+ }
+ feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setConfigId(items.getJSONObject(itemIndex).getString("configId"));
+ feeConfigDto.setFeeName(items.getJSONObject(itemIndex).getString("configName"));
+ feeConfigDtos.add(feeConfigDto);
+ }
+ }
+
+ return feeConfigDtos;
+ }
+
+ private boolean existsFeeConfig(List<FeeConfigDto> feeConfigDtos, JSONObject oweFee) {
+ if (feeConfigDtos.size() < 1) {
+ return false;
+ }
+ for (FeeConfigDto feeConfigDto : feeConfigDtos) {
+ if (feeConfigDto.getConfigId().equals(oweFee.getString("configId"))) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+
private void reportPayFeeDetail(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("缂磋垂寮�濮嬫椂闂�");
- 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("鍑忓厤閲戦");
+ row.createCell(11).setCellValue("婊炵撼閲�");
+ row.createCell(12).setCellValue("绌虹疆鎴挎墦鎶橀噾棰�");
+ row.createCell(13).setCellValue("绌虹疆鎴垮噺鍏嶉噾棰�");
+ row.createCell(14).setCellValue("涓氫富");
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportPayFeeDetail(pd, result);
+ if (rooms == null) {
+ return;
+ }
JSONObject dataObj = 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(0).setCellValue(dataObj.getString("oId"));
row.createCell(1).setCellValue(dataObj.getString("objName"));
row.createCell(2).setCellValue(dataObj.getString("feeName"));
- row.createCell(3).setCellValue(dataObj.getString("startTime"));
- row.createCell(4).setCellValue(dataObj.getString("endTime"));
- row.createCell(5).setCellValue(dataObj.getString("createTime"));
- row.createCell(6).setCellValue(dataObj.getString("receivableAmount"));
- row.createCell(7).setCellValue(dataObj.getString("receivedAmount"));
+ row.createCell(3).setCellValue(dataObj.getString("primeRate"));
+ row.createCell(4).setCellValue(dataObj.getString("startTime"));
+ row.createCell(5).setCellValue(dataObj.getString("endTime"));
+ row.createCell(6).setCellValue(dataObj.getString("createTime"));
+ row.createCell(7).setCellValue(dataObj.getDouble("receivableAmount"));
+ row.createCell(8).setCellValue(dataObj.getDouble("receivedAmount"));
+ row.createCell(9).setCellValue(dataObj.getDouble("preferentialAmount"));
+ row.createCell(10).setCellValue(dataObj.getDouble("deductionAmount"));
+ row.createCell(11).setCellValue(dataObj.getDouble("lateFee"));
+ row.createCell(12).setCellValue(dataObj.getDouble("vacantHousingDiscount"));
+ row.createCell(13).setCellValue(dataObj.getDouble("vacantHousingReduction"));
+ row.createCell(14).setCellValue(dataObj.getString("ownerName"));
}
+ }
+
+ private void reportYearCollection(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("搴旀敹閲戦");
+
+ //鏌ヨ妤兼爧淇℃伅
+ JSONArray rooms = this.getReportYearCollection(pd, result);
+ if (rooms == null) {
+ return;
+ }
+ JSONArray reportFeeYearCollectionDetailDtos = rooms.getJSONObject(0).getJSONArray("reportFeeYearCollectionDetailDtos");
+
+ for (int detailIndex = 0; detailIndex < reportFeeYearCollectionDetailDtos.size(); detailIndex++) {
+ row.createCell(6 + detailIndex).setCellValue(reportFeeYearCollectionDetailDtos.getJSONObject(detailIndex).getString("collectionYear") + "骞�");
+ }
+
+ JSONObject dataObj = null;
+ for (int roomIndex = 0; roomIndex < rooms.size(); roomIndex++) {
+ row = sheet.createRow(roomIndex + 1);
+ dataObj = rooms.getJSONObject(roomIndex);
+ row.createCell(0).setCellValue(dataObj.getString("ownerName"));
+ row.createCell(1).setCellValue(dataObj.getString("objName"));
+ row.createCell(2).setCellValue(dataObj.getString("ownerLink"));
+ row.createCell(3).setCellValue(dataObj.getString("builtUpArea"));
+ row.createCell(4).setCellValue(dataObj.getString("feeName"));
+ row.createCell(5).setCellValue(dataObj.getString("receivableAmount"));
+
+ reportFeeYearCollectionDetailDtos = dataObj.getJSONArray("reportFeeYearCollectionDetailDtos");
+ for (int detailIndex = 0; detailIndex < reportFeeYearCollectionDetailDtos.size(); detailIndex++) {
+ row.createCell(6 + detailIndex).setCellValue(reportFeeYearCollectionDetailDtos.getJSONObject(detailIndex).getString("receivedAmount"));
+ }
+ }
+ }
+
+ private JSONArray getReportListOweFees(IPageData pd, ComponentValidateResult result) {
+ String apiUrl = "";
+ ResponseEntity<String> responseEntity = null;
+ JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
+ reqJson.put("page", 1);
+ reqJson.put("row", 10000);
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api//reportOweFee/queryReportAllOweFee" + mapToUrlParam(reqJson);
+ responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
+ return null;
+ }
+ JSONObject savedRoomInfoResults = JSONObject.parseObject(responseEntity.getBody(), Feature.OrderedField);
+ if (!savedRoomInfoResults.containsKey("data")) {
+ return null;
+ }
+ return savedRoomInfoResults.getJSONArray("data");
}
private JSONArray getReportPayFeeDetail(IPageData pd, ComponentValidateResult result) {
@@ -151,19 +371,31 @@
reqJson.put("row", 10000);
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryPayFeeDetail" + mapToUrlParam(reqJson);
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
-
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
}
-
JSONObject savedRoomInfoResults = JSONObject.parseObject(responseEntity.getBody(), Feature.OrderedField);
-
-
if (!savedRoomInfoResults.containsKey("data")) {
return null;
}
+ return savedRoomInfoResults.getJSONArray("data");
+ }
-
+ private JSONArray getReportYearCollection(IPageData pd, ComponentValidateResult result) {
+ String apiUrl = "";
+ ResponseEntity<String> responseEntity = null;
+ JSONObject reqJson = JSONObject.parseObject(pd.getReqData());
+ reqJson.put("page", 1);
+ reqJson.put("row", 10001);
+ apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeYearCollection/queryReportFeeYear" + mapToUrlParam(reqJson);
+ responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
+ if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
+ return null;
+ }
+ JSONObject savedRoomInfoResults = JSONObject.parseObject(responseEntity.getBody(), Feature.OrderedField);
+ if (!savedRoomInfoResults.containsKey("data")) {
+ return null;
+ }
return savedRoomInfoResults.getJSONArray("data");
}
@@ -176,22 +408,18 @@
row.createCell(3).setCellValue("璐圭敤寮�濮嬫椂闂�");
row.createCell(4).setCellValue("娆犺垂鏃堕暱锛堝ぉ锛�");
row.createCell(5).setCellValue("娆犺垂閲戦");
-
-
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportOweFeeDetail(pd, result);
JSONObject dataObj = 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("feeName"));
row.createCell(3).setCellValue(dataObj.getString("feeCreateTime"));
row.createCell(4).setCellValue(dataObj.getString("oweDay"));
row.createCell(5).setCellValue(dataObj.getString("oweAmount"));
-
}
}
@@ -205,23 +433,19 @@
row.createCell(4).setCellValue("璐圭敤缁撴潫鏃堕棿");
row.createCell(5).setCellValue("搴旀敹閲戦");
row.createCell(6).setCellValue("瀹炴敹閲戦");
-
-
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFeeDetail(pd, result);
JSONObject dataObj = 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("feeName"));
row.createCell(3).setCellValue(dataObj.getString("feeCreateTime"));
- row.createCell(4).setCellValue("-");
+ row.createCell(4).setCellValue(dataObj.getString("deadlineTime"));
row.createCell(5).setCellValue(dataObj.getString("receivableAmount"));
row.createCell(6).setCellValue(dataObj.getString("receivedAmount"));
-
}
}
@@ -230,19 +454,13 @@
ResponseEntity<String> responseEntity = null;
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryOweFeeDetail?communityId=" + result.getCommunityId() + "&page=1&row=10000";
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
-
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
}
-
JSONObject savedRoomInfoResults = JSONObject.parseObject(responseEntity.getBody(), Feature.OrderedField);
-
-
if (!savedRoomInfoResults.containsKey("data")) {
return null;
}
-
-
return savedRoomInfoResults.getJSONArray("data");
}
@@ -251,19 +469,13 @@
ResponseEntity<String> responseEntity = null;
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryFeeDetail?communityId=" + result.getCommunityId() + "&page=1&row=10000";
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
-
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
}
-
JSONObject savedRoomInfoResults = JSONObject.parseObject(responseEntity.getBody(), Feature.OrderedField);
-
-
if (!savedRoomInfoResults.containsKey("data")) {
return null;
}
-
-
return savedRoomInfoResults.getJSONArray("data");
}
@@ -271,49 +483,40 @@
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(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.getReportFeeBreakdown(pd, result);
JSONObject dataObj = 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(1).setCellValue(dataObj.getString("receivableAmount"));
- row.createCell(4).setCellValue(dataObj.getString("receivedAmount"));
- row.createCell(5).setCellValue(dataObj.getString("oweAmount"));
-
+ row.createCell(4).setCellValue(dataObj.getString("receivableAmount"));
+ row.createCell(5).setCellValue(dataObj.getString("receivedAmount"));
+ row.createCell(6).setCellValue(dataObj.getString("oweAmount"));
}
}
private JSONArray getReportFeeBreakdown(IPageData pd, ComponentValidateResult result) {
-
String apiUrl = "";
ResponseEntity<String> responseEntity = null;
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryFeeBreakdown?communityId=" + result.getCommunityId() + "&page=1&row=10000";
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
-
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
}
-
JSONObject savedRoomInfoResults = JSONObject.parseObject(responseEntity.getBody(), Feature.OrderedField);
-
-
if (!savedRoomInfoResults.containsKey("data")) {
return null;
}
-
-
return savedRoomInfoResults.getJSONArray("data");
}
@@ -326,22 +529,18 @@
row.createCell(3).setCellValue("搴旀敹閲戦");
row.createCell(4).setCellValue("瀹炴敹閲戦");
row.createCell(5).setCellValue("娆犺垂閲戦");
-
-
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFloorUnitFeeSummary(pd, result);
JSONObject dataObj = 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("floorNum") + "鍙锋ゼ");
- row.createCell(3).setCellValue(dataObj.getString("unitNum") + "鍗曞厓");
+ 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"));
-
}
}
@@ -350,23 +549,15 @@
ResponseEntity<String> responseEntity = null;
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryFloorUnitFeeSummary?communityId=" + result.getCommunityId() + "&page=1&row=10000";
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
-
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
}
-
JSONObject savedRoomInfoResults = JSONObject.parseObject(responseEntity.getBody(), Feature.OrderedField);
-
-
if (!savedRoomInfoResults.containsKey("data")) {
return null;
}
-
-
return savedRoomInfoResults.getJSONArray("data");
-
}
-
/**
* 鏌ヨ瀛樺湪鐨勬埧灞嬩俊鎭�
@@ -381,21 +572,14 @@
ResponseEntity<String> responseEntity = null;
apiUrl = ServiceConstant.SERVICE_API_URL + "/api/reportFeeMonthStatistics/queryReportFeeSummary?communityId=" + result.getCommunityId() + "&page=1&row=10000";
responseEntity = this.callCenterService(restTemplate, pd, "", apiUrl, HttpMethod.GET);
-
if (responseEntity.getStatusCode() != HttpStatus.OK) { //璺宠繃 淇濆瓨鍗曞厓淇℃伅
return null;
}
-
JSONObject savedRoomInfoResults = JSONObject.parseObject(responseEntity.getBody(), Feature.OrderedField);
-
-
if (!savedRoomInfoResults.containsKey("data")) {
return null;
}
-
-
return savedRoomInfoResults.getJSONArray("data");
-
}
/**
@@ -411,20 +595,16 @@
row.createCell(1).setCellValue("搴旀敹閲戦");
row.createCell(2).setCellValue("瀹炴敹閲戦");
row.createCell(3).setCellValue("娆犺垂閲戦");
-
-
//鏌ヨ妤兼爧淇℃伅
JSONArray rooms = this.getReportFeeSummaryFee(pd, componentValidateResult);
JSONObject dataObj = 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"));
-
}
}
--
Gitblit v1.8.0