Merge branch 'master' of http://111.75.220.136:10030/jxjk/src

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

@@ -1159,7 +1159,7 @@ public class AvgInterestRateDataCusRptPlugin extends AbstractTmcTreeReportDataPl
             DataSet loanDataSet = getFinanceCostDataSet("FinanceCostDataHelper.queryDataSet" + loanType, entityName, filter, bizSelectFields);
             result = result.leftJoin(loanDataSet).on("id", "id").select(result.getRowMeta().getFieldNames(), new String[]{"ecreditor", "etextcreditor", "edrawamount vamount"}).finish();
             result = result.updateFields(new String[]{"edrawamount", "creditor", "textcreditor"}, new String[]{"case when vamount!=null then vamount else edrawamount end", "case when vamount is null then creditor else ecreditor end", "case when vamount is null then textcreditor else etextcreditor end"}).select(new String[]{"id", "loantype", "interesttype", "orgid", "orgname", "finproductid", "finproduct", "drawamount", "edrawamount", "contractbillno", "billno", "creditortype", "creditor", "textcreditor", "currency", "currencyname", "startintdate", "expiredate", "startdate", "enddate", "yearrate", "balance", "exchangerate", "converamt", "day", "dayweight", "perpetualbond", "isnofixedterm", "cleardate", "avgamt", "estimatedinterest"});
-            result = getSlAndBondRepayDs(result, repayResDs, loanType);
+//            result = getSlAndBondRepayDs(result, repayResDs, loanType);
         }
 
         return othreResult.select(result.getRowMeta().getFieldNames()).union(result);