فهرست منبع

1、修改融资业务总体表取数逻辑

wanghaiwu 5 روز پیش
والد
کامیت
5e84b893ac

+ 1 - 1
main/java/kd/cosmic/jkjt/tmc/cfm/report/data/FinanceCollectDataRptPlugin.java

@@ -280,7 +280,7 @@ public class FinanceCollectDataRptPlugin extends AbstractTmcTreeReportDataPlugin
         sql.append("select floanbillid id, floanbillid as loanbillid, '' as summarycol, 0 as findebtslevel, forgid as orgid, forgname fincompanyname, forgname as orgname, fbizdate as drawdate \r\n");
         sql.append(" , fexpiredate  expiredate, fterm nckd_residuedays, fstartloanrate nckd_startrate, flatestrate intrate, fbillno as loanbillno, ffinproduct as finproductname, fcreditor as fincreditorname \r\n");
         sql.append(" , fcreditortype as fincreditortype, floantype, famount amount, fpayinterestamount + fcalculaterateamount estinterestamt, fcreditortype creditortype, fcreditorid as creditorid \r\n");
-        sql.append(" , fcurrencyid as loancurrency, fcurrency as loancurrencyname, fdrawamount as drawamount, fdrawamount as drawamount1 \r\n");
+        sql.append(" , fcurrencyid as loancurrency, fcurrency as loancurrencyname, fdrawamount as drawamount, fdrawamount as drawamount1, fentityname nckd_entityname \r\n");
         sql.append(" ,0 repayamt,0 repayamt1,0 notrepayamt, finteresttype as interesttype, '' contractbillno, '' contractno \r\n");
         sql.append(" , 0 as concurrency, fguarantee as guaranteeway, famount as contractamt, fsettleintmode as settleintmode, frepaymentway as repaymentway \r\n");
 

+ 9 - 7
main/java/kd/cosmic/jkjt/tmc/cfm/report/data/FinanceCollectFromRptPlugin.java

@@ -94,13 +94,15 @@ public class FinanceCollectFromRptPlugin extends TradeFinanceFromListPlugin {
             String increditorname = (String) rowData.get("fincreditorname");
 
             if("回购业务".equals(financingmode)){
-                if("中央结算所".equals(increditorname)) {
-                    sp.setFormId("nckd_centralclear");
-                } else if("上海清算所".equals(increditorname)) {
-                    sp.setFormId("nckd_shclrhimp");
-                } else {
-                    sp.setFormId("nckd_buybackaction");
-                }
+                String entityName = (String)rowData.get("nckd_entityname");
+//                if("中央结算所".equals(increditorname)) {
+//                    sp.setFormId("nckd_centralclear");
+//                } else if("上海清算所".equals(increditorname)) {
+//                    sp.setFormId("nckd_shclrhimp");
+//                } else {
+//                    sp.setFormId("nckd_buybackaction");
+//                }
+                sp.setFormId(entityName);
             } else if ("ifm_internalloan_dtl_rpt".equals(viewForm)) {
                 sp.setFormId("ifm_loanbill");
             } else {