From 521e78fc74fc7ad8850ee48e3284fb3a1da8081a Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Fri, 19 Aug 2022 19:31:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=80=BB=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../cn/palmte/work/utils/excel/ExportSettleExcelUtils.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cn/palmte/work/utils/excel/ExportSettleExcelUtils.java b/src/main/java/cn/palmte/work/utils/excel/ExportSettleExcelUtils.java
index 9da4605..1787ff6 100644
--- a/src/main/java/cn/palmte/work/utils/excel/ExportSettleExcelUtils.java
+++ b/src/main/java/cn/palmte/work/utils/excel/ExportSettleExcelUtils.java
@@ -780,9 +780,9 @@ public class ExportSettleExcelUtils {
sixthCell.setCellStyle(style2);
sixthCell.setCellType(CellType.NUMERIC);
if (currentBean.getIncomeTotalTaxExclude().abs().compareTo(BigDecimal.valueOf(0.01)) > 0) {
- sixthCell.setCellValue(Utils.format(currentBean.getNetProfitMargin().multiply(new BigDecimal(100)).divide(currentBean.getIncomeTotalTaxExclude(), BigDecimal.ROUND_CEILING)));
+ sixthCell.setCellValue(Utils.format(currentBean.getNetProfit().multiply(new BigDecimal(100)).divide(currentBean.getIncomeTotalTaxExclude(), BigDecimal.ROUND_CEILING)));
} else {
- sixthCell.setCellValue(Utils.format(currentBean.getNetProfitMargin().multiply(new BigDecimal(100))));
+ sixthCell.setCellValue(Utils.format(currentBean.getNetProfit().multiply(new BigDecimal(100))));
}
// sixthCell.setCellValue(Utils.format(currentBean.getNetProfitMargin()));
}