融资加权平均成本总表

1、处理年利率为0的取数bug

main/java/kd/cosmic/jkjt/tmc/cfm/report/data/FinCostCalCommonCusHelper.java

@@ -99,10 +99,10 @@ public class FinCostCalCommonCusHelper {
 
         QFilter noRateFilter = (new QFilter("billstatus", "=", BillStatusEnum.AUDIT.getValue())).and("confirmstatus", "=", ConfirmStatusEnum.YETCONFIRM.getValue()).and("bizdate", "<=", endDateBal);
         noRateFilter = noRateFilter.copy().and("loans.e_loanbill", "in", noRateIdList);
-        DataSet notRateRepaymentDs = QueryServiceHelper.queryDataSet("getRepaymentDs_notsl", "cfm_repaymentbill", "loans.e_loanbill loanid, bizdate repaydate, loans.e_repayamount repayamt", new QFilter[]{noRateFilter}, "loans.e_loanbill, bizdate");
-        notRateRepaymentDs = financeCostDataSet.copy().join(notRateRepaymentDs).on("id", "loanid").select(new String[]{"id as loanid", "drawamount"}, new String[]{"repaydate", "repayamt"}).finish();
+        DataSet notRateRepaymentDs = QueryServiceHelper.queryDataSet("getRepaymentDs_notsl", "cfm_repaymentbill", "loans.e_loanbill.id loanid, bizdate repaydate, loans.e_repayamount repayamt", new QFilter[]{noRateFilter}, "loans.e_loanbill, bizdate");
+        notRateRepaymentDs = noRateDataSet.copy().join(notRateRepaymentDs).on("id", "loanid").select(new String[]{"id as loanid", "drawamount"}, new String[]{"repaydate", "repayamt"}).finish();
 
-        DataSet unionDataSet = financeCostDataSet.copy().select("id as loanid", "drawamount", "startintdate as repaydate", "0 as repayamt").union(notRateRepaymentDs).orderBy(new String[]{"loanid", "repaydate"});
+        DataSet unionDataSet = noRateDataSet.copy().select("id as loanid", "drawamount", "startintdate as repaydate", "0 as repayamt").union(notRateRepaymentDs).orderBy(new String[]{"loanid", "repaydate"});
 
         RowMeta rowMeta = new RowMeta(new String[]{"loanbillid", "interestbegindate", "interestenddate", "interestprinciple", "interestrate"}, new DataType[]{DataType.LongType, DataType.DateType, DataType.DateType, DataType.BigDecimalType, DataType.BigDecimalType});
         DataSetBuilder builder = Algo.create("notbackds").createDataSetBuilder(rowMeta);