Browse Source

总账取数修复

zhang_kun 2 days ago
parent
commit
fdaaea91b1

+ 6 - 6
Procedure/backend/project/src/main/java/com/sundata/product/rwa/calc/service/implement/units/GeneralLedgerGetterUnit.java

@@ -260,15 +260,15 @@ public class GeneralLedgerGetterUnit extends CalcUnit {
                 RISK_EXPOSURE_LEV01_CODE = LevelUtil.subAndAdd(ledgerRiskexposureNo, 3, "00");
                 RISK_EXPOSURE_LEV01_CODE_NAME = riskExposureDefinitionModelMap.get(RISK_EXPOSURE_LEV01_CODE).getRiskExposureName();
             }
-            String RISK_EXPOSURE_CODE = (String) DataUtil.getDataDefault(map.get("LEDGER_OFFOBJECT_NO"), String.class);
-            String RISK_EXPOSURE_NAME = (String) DataUtil.getDataDefault(infoListModel.get((String) DataUtil.getDataDefault(map.get("LEDGER_OFFOBJECT_NO"), String.class)), String.class);
+            String RISK_EXPOSURE_CODE = (String) DataUtil.getDataDefault(map.get("LEDGER_RISKEXPOSURE_NO"), String.class);
+            String RISK_EXPOSURE_NAME = (String) DataUtil.getDataDefault(riskExposureDefinitionModelMap.get((String) DataUtil.getDataDefault(map.get("LEDGER_RISKEXPOSURE_NO"), String.class)), String.class);
 
             BigDecimal LOAN_WEIGHT = (BigDecimal) DataUtil.getDataDefault(riskExposureDefinitionModelMap.get(ledgerRiskexposureNo).getRiskExposureWeight(), BigDecimal.class);
             ;
             BigDecimal EAD = BALANCE;
-            if (map.get("RESULT_TYPE") != null && !map.get("RESULT_TYPE").equals("3")) {
+            if (map.get("RESULT_TYPE") != null && map.get("RESULT_TYPE").equals("3")) {
                 EAD = BigDecimal.ZERO.subtract(BALANCE);
-            } else if (map.get("RESULT_TYPE") != null && !map.get("RESULT_TYPE").equals("2")) {
+            } else if (map.get("RESULT_TYPE") != null && map.get("RESULT_TYPE").equals("2")) {
                 EAD = BALANCE.multiply(CCF);
             }
             BigDecimal RWA = EAD.multiply(LOAN_WEIGHT);
@@ -277,8 +277,8 @@ public class GeneralLedgerGetterUnit extends CalcUnit {
             String INVEST_INDUSTRY = "其他";
             String BUSINESS_LINE = "其他-总账取数债项";
             String dateStr = (String) context.get("DATA_DATE");
-            String EFF_DATE = dateStr.substring(dateStr.lastIndexOf("-") + 1) + "01";
-            String DUE_DATE = dateStr.substring(dateStr.lastIndexOf("-") + 1) + (DateChecker.getShortCalendar(dateStr)).getActualMaximum(Calendar.DAY_OF_MONTH);
+            String EFF_DATE = dateStr.substring(0,6) + "01";//2002-01-01
+            String DUE_DATE = dateStr.substring(0,6) + (DateChecker.getShortCalendar(dateStr)).getActualMaximum(Calendar.DAY_OF_MONTH);
 
             sqlParam.addValue("CALCINDEX", CALCINDEX);
             sqlParam.addValue("SDATE", SDATE);