From 7ff6e6ac3d2cca7593162eb49d135cc0cb6b9105 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 一月 2022 10:15:54 +0800
Subject: [PATCH] 云卓全景支付 开发完成
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 a2f89b2..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
@@ -6,6 +6,7 @@
import com.java110.api.smo.DefaultAbstractComponentSMO;
import com.java110.api.smo.assetExport.IExportFeeManualCollectionSMO;
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;
@@ -340,6 +341,7 @@
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);
@@ -354,12 +356,18 @@
} 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