|
|
@@ -199,10 +199,10 @@ public class GeneralLedgerUnit extends CalcUnit {
|
|
|
String subjectSum = DBExecutor.doQuery(subjectSql);
|
|
|
String productSum = DBExecutor.doQuery(productSql);
|
|
|
if (!NumberUtil.isNumber(subjectSum)) {
|
|
|
- continue;
|
|
|
+ subjectSum ="0";
|
|
|
}
|
|
|
if (!NumberUtil.isNumber(productSum)) {
|
|
|
- continue;
|
|
|
+ productSum ="0";
|
|
|
}
|
|
|
BigDecimal subjectSumBigDecimal = new BigDecimal(subjectSum); // 总账汇总金额(万元)
|
|
|
BigDecimal productSumBigDecimal = new BigDecimal(productSum); // 勾稽汇总金额(万元)
|
|
|
@@ -340,9 +340,9 @@ public class GeneralLedgerUnit extends CalcUnit {
|
|
|
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);
|
|
|
|
|
|
- sqlParam.addValue("GL_CODE", ruleListModel.getRuleNo());
|
|
|
+ sqlParam.addValue("GL_CODE", ruleListModel.getGlCode());
|
|
|
sqlParam.addValue("SUBJECT_DESC", ruleListModel.getSubjectDesc());
|
|
|
- sqlParam.addValue("LOAN_REFERENCE_NO", "XNZX" + ruleListModel.getRuleNo());
|
|
|
+ sqlParam.addValue("LOAN_REFERENCE_NO", "XNZX" + ruleListModel.getGlCode());
|
|
|
sqlParam.addValue("BALANCE_ON", on);
|
|
|
sqlParam.addValue("BALANCE_OFF", off);
|
|
|
sqlParam.addValue("RESERVE", o);
|
|
|
@@ -362,8 +362,8 @@ public class GeneralLedgerUnit extends CalcUnit {
|
|
|
sqlParam.addValue("UNFINISH_EAD", differAmt);
|
|
|
sqlParam.addValue("UNFINISH_RWA", differAmt.multiply(RISKEXPOSURE_WEIGHT));
|
|
|
sqlParam.addValue("RWA", differAmt.multiply(RISKEXPOSURE_WEIGHT));
|
|
|
- sqlParam.addValue("CUST_NAME", "虚拟客户" + ruleListModel.getRuleNo());
|
|
|
- sqlParam.addValue("CUST_NO", "XNKH" + ruleListModel.getRuleNo());
|
|
|
+ sqlParam.addValue("CUST_NAME", "虚拟客户" + ruleListModel.getGlCode());
|
|
|
+ sqlParam.addValue("CUST_NO", "XNKH" + ruleListModel.getGlCode());
|
|
|
sqlParam.addValue("BP_CUST_NO", "其他");
|
|
|
sqlParam.addValue("INVEST_INDUSTRY", "其他");
|
|
|
sqlParam.addValue("BUSINESS_LINE", "其他");
|
|
|
@@ -377,7 +377,7 @@ public class GeneralLedgerUnit extends CalcUnit {
|
|
|
}
|
|
|
|
|
|
|
|
|
- sqlParam.addValue("RULE_ID", ruleListModel.getRuleNo());
|
|
|
+ sqlParam.addValue("RULE_ID", ruleListModel.getRuleId());
|
|
|
sqlParam.addValue("RULE_NAME", ruleListModel.getRuleName());
|
|
|
sqlParam.addValue("SUBJCODE", ruleListModel.getGlCode());
|
|
|
sqlParam.addValue("SUBJNAME", ruleListModel.getSubjectDesc());
|
zhang_qk