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())); }