From 45149c4de50d945a27cbc7324ec0699f5b15df14 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 27 二月 2024 13:57:47 +0800
Subject: [PATCH] 取消空格问题
---
service-api/src/main/java/com/java110/api/smo/assetExport/impl/ExportFeeManualCollectionSMOImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 dbb2d15..a6fa67b 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
@@ -8,7 +8,7 @@
import com.java110.core.context.IPageData;
import com.java110.core.log.LoggerFactory;
import com.java110.dto.fee.FeeDto;
-import com.java110.entity.component.ComponentValidateResult;
+import com.java110.dto.system.ComponentValidateResult;
import com.java110.utils.util.Assert;
import com.java110.utils.util.Base64Convert;
import com.java110.utils.util.DateUtil;
@@ -348,7 +348,7 @@
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"))) {
+ if (feeObj.containsKey("feeFlag") && (FeeDto.FEE_FLAG_CYCLE.equals(feeObj.getString("feeFlag")) || FeeDto.FEE_FLAG_CYCLE_ONCE.equals(feeObj.getString("feeFlag")))) {
endTime = DateUtil.getFormatTimeString(DateUtil.stepDay(DateUtil.getDateFromString(endTime, DateUtil.DATE_FORMATE_STRING_B), -1),
DateUtil.DATE_FORMATE_STRING_B);
}
@@ -385,7 +385,7 @@
}
cell3.setCellStyle(cellStyle);
cell4 = row.createCell(4);
- cell4.setCellValue(feeObj.getString("feePrice"));
+ cell4.setCellValue(feeObj.getString("feeTotalPrice"));
cell4.setCellStyle(cellStyle);
cell5 = row.createCell(5);
cell5.setCellValue("0");
@@ -394,7 +394,7 @@
cell6.setCellValue("");
cell6.setCellStyle(cellStyle);
row.setHeight((short) (defaultRowHeight));
- totalPrice = totalPrice.add(new BigDecimal(feeObj.getString("feePrice")));
+ totalPrice = totalPrice.add(new BigDecimal(feeObj.getString("feeTotalPrice")));
}
row = sheet.createRow(line + fees.size() + 3);
--
Gitblit v1.8.0