diff --git a/main/java/shjh/jhzj7/fi/fi/plugin/report/FinancialFormReport.java b/main/java/shjh/jhzj7/fi/fi/plugin/report/FinancialFormReport.java index bcdfb1c..45b1ff1 100644 --- a/main/java/shjh/jhzj7/fi/fi/plugin/report/FinancialFormReport.java +++ b/main/java/shjh/jhzj7/fi/fi/plugin/report/FinancialFormReport.java @@ -142,7 +142,7 @@ public class FinancialFormReport extends AbstractReportFormPlugin implements Plu //实际总收益率=实际收益/金额 BigDecimal actualEarnings = ReportUtils.getBigDecimalValue(row, DYNAMICS_FIELDS[8]); row.set(DYNAMICS_FIELDS[9],actualEarnings - .divide(buyAmount,8, RoundingMode.HALF_UP) + .divide(buyAmount,4, RoundingMode.HALF_UP) .multiply(BigDecimal.valueOf(100))); sumActualEarnings=sumActualEarnings.add(actualEarnings); @@ -342,7 +342,7 @@ public class FinancialFormReport extends AbstractReportFormPlugin implements Plu //计提日最近估值记录获取——(赎回金额+实际收益)* 所有赎回单 allRedAmount=this.getRealRevenueAmount(dynamicObjectCollection,closestRecord.getDate("e_valuationdate")); - row.set(DYNAMICS_FIELDS[8], allRedAmount); // 实际收益 + row.set(DYNAMICS_FIELDS[8], allRedAmount.divide(BigDecimal.valueOf(1000),8, RoundingMode.HALF_UP)); // 实际收益 //计提日最近估值记录获取——(1-赎回份额/赎回日剩余份额)* 所有赎回单 allRedProductAmount=this.getRedProductAmount(dynamicObjectCollection,closestRecord.getDate("e_valuationdate")); //计算金额(千元)