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/ExportFeeManualCollectionSMOImpl.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java
index 0371f49..0bc0e7f 100644
--- a/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java
@@ -4,12 +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.core.context.IPageData;
-import com.java110.core.factory.Java110ThreadPoolFactory;
-import com.java110.entity.component.ComponentValidateResult;
import com.java110.api.smo.assetExport.IExportFeeManualCollectionSMO;
-import com.java110.utils.constant.ServiceConstant;
+import com.java110.core.context.IPageData;
+import com.java110.dto.fee.FeeConfigDto;
+import com.java110.dto.fee.FeeDto;
+import com.java110.entity.component.ComponentValidateResult;
import com.java110.utils.util.Assert;
import com.java110.utils.util.Base64Convert;
import com.java110.utils.util.DateUtil;
@@ -32,8 +31,8 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.math.BigDecimal;
+import java.text.ParseException;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
/**
@@ -342,17 +341,33 @@
BigDecimal totalPrice = new BigDecimal(0);
String startTime = "";
String endTime = "";
+ String squarePrice = "";
for (int feeIndex = 0; feeIndex < fees.size(); feeIndex++) {
JSONObject feeObj = fees.getJSONObject(feeIndex);
row = sheet.createRow(line + feeIndex + 3);
startTime = feeObj.getString("endTime").length() > 10 ? feeObj.getString("endTime").substring(0, 10) : feeObj.getString("endTime");
endTime = feeObj.getString("deadlineTime").length() > 10 ? feeObj.getString("deadlineTime").substring(0, 10) : feeObj.getString("deadlineTime");
+ //濡傛灉璐圭敤鏄懆鏈熸�ц垂鐢� 鍒� 缁撴潫鏃堕棿鍑忎竴澶�
+ try {
+ if (feeObj.containsKey("feeFlag") && FeeDto.FEE_FLAG_CYCLE.equals(feeObj.getString("feeFlag"))) {
+ endTime = DateUtil.getFormatTimeString(DateUtil.stepDay(DateUtil.getDateFromString(endTime, DateUtil.DATE_FORMATE_STRING_B), -1),
+ DateUtil.DATE_FORMATE_STRING_B);
+ }
+ } catch (ParseException e) {
+ logger.error("澶勭悊缁撴潫鏃堕棿澶辫触", e);
+ }
+ squarePrice = feeObj.getString("squarePrice");
+
+ //鍔ㄦ�佽垂鐢ㄥ崟浠峰氨鍘诲姩鎬佸崟浠�
+ if(feeObj.containsKey("computingFormula") && "9009".equals(feeObj.getString("computingFormula"))){
+ squarePrice = feeObj.getString("mwPrice");
+ }
cell0 = row.createCell(0);
cell0.setCellValue(feeObj.getString("feeName"));
cell0.setCellStyle(cellStyle);
cell1 = row.createCell(1);
- cell1.setCellValue(feeObj.getString("squarePrice"));
+ cell1.setCellValue(squarePrice);
cell1.setCellStyle(cellStyle);
cell2 = row.createCell(2);
cell2.setCellValue(room.getString("builtUpArea"));
--
Gitblit v1.8.0