Parcourir la source

统计待处理问题

CodeLife_leno il y a 1 mois
Parent
commit
125ea29b4e

+ 8 - 5
Procedure/backend/project/src/main/java/com/sundata/product/rwa/calc/service/implement/units/GeneralLedgerUnit.java

@@ -54,9 +54,9 @@ public class GeneralLedgerUnit extends CalcUnit {
         log.info(UnitStaticFun.getSelectSql("RWA_APM_BUS_RS_ACCADJUSTMENT", FinalStrs._ALLHIS, calculateInstanceNumber));
         log.info(UnitStaticFun.getSelectSql("RWA_APM_BUS_RS_ACCADJUSTMENT", FinalStrs._MASTER, calculateInstanceNumber));
         log.info(UnitStaticFun.getSelectSql("RWA_APM_BUS_RS_ACCADJUSTMENT", null, calculateInstanceNumber));
-        log.info(UnitStaticFun.getSelectSql("RWA_APM_BUS_RS_LEDGRESULT", FinalStrs._ALLHIS, calculateInstanceNumber));
-        log.info(UnitStaticFun.getSelectSql("RWA_APM_BUS_RS_LEDGRESULT", FinalStrs._MASTER, calculateInstanceNumber));
-        log.info(UnitStaticFun.getSelectSql("RWA_APM_BUS_RS_LEDGRESULT", null, calculateInstanceNumber));
+        log.info(UnitStaticFun.getSelectSql("RWA_LEART_INS_LEDGRESULT", FinalStrs._ALLHIS, calculateInstanceNumber));
+        log.info(UnitStaticFun.getSelectSql("RWA_LEART_INS_LEDGRESULT", FinalStrs._MASTER, calculateInstanceNumber));
+        log.info(UnitStaticFun.getSelectSql("RWA_LEART_INS_LEDGRESULT", null, calculateInstanceNumber));
     }
 
     @Override
@@ -77,7 +77,7 @@ public class GeneralLedgerUnit extends CalcUnit {
         // 差异容忍度规则定义
         UnitStaticFun.handleTableDataWithSuffixes("RWA_CALC_CONF_DIFFTOLERANCE", this.getCalcUnitInstanceNumber());
         // 总账勾稽结果表
-        UnitStaticFun.handleTableDataWithSuffixes("RWA_APM_BUS_RS_LEDGRESULT", this.getCalcUnitInstanceNumber());
+        UnitStaticFun.handleTableDataWithSuffixes("RWA_LEART_INS_LEDGRESULT", this.getCalcUnitInstanceNumber());
         // 总账差异结果表
         UnitStaticFun.handleTableDataWithSuffixes("RWA_APM_BUS_RS_ACCADJUSTMENT", this.getCalcUnitInstanceNumber());
     }
@@ -90,7 +90,7 @@ public class GeneralLedgerUnit extends CalcUnit {
         // 差异容忍度规则定义
         UnitStaticFun.handleTableWithSuffixes("RWA_CALC_CONF_DIFFTOLERANCE");
         // 总账勾稽结果表
-        UnitStaticFun.handleTableWithSuffixes("RWA_APM_BUS_RS_LEDGRESULT");
+        UnitStaticFun.handleTableWithSuffixes("RWA_LEART_INS_LEDGRESULT");
         // 总账差异结果表
         UnitStaticFun.handleTableWithSuffixes("RWA_APM_BUS_RS_ACCADJUSTMENT");
 
@@ -102,6 +102,8 @@ public class GeneralLedgerUnit extends CalcUnit {
         StringSubstitutor sub = new StringSubstitutor(context);
         RuleListService ruleListService = SpringUtil.getBean(RuleListService.class);
         List<RuleListModel> ruleListModels = ruleListService.rule_list(new RuleListModel());
+        // TODO 需要获取容忍度处理逻辑,并将容忍度处理逻辑处理为一个基于科目编号的map,下面的处理过程中,根据实际容忍度处理结果
+        // TODO 这两个表不存在 select * from RWA_LEART_INS_LEDGRESULT; select * from RWA_APM_BUS_RS_ACCADJUSTMENT;
         for (RuleListModel ruleListModel : ruleListModels) {
             String subjectSql = sub.replace(ruleListModel.getSubjectSql());
             String productSql = sub.replace(ruleListModel.getProductSql());
@@ -118,6 +120,7 @@ public class GeneralLedgerUnit extends CalcUnit {
             BigDecimal subjectSumBigDecimal = new BigDecimal(subjectSum);
             BigDecimal productSumBigDecimal = new BigDecimal(productSum);
             BigDecimal result = subjectSumBigDecimal.subtract(productSumBigDecimal);// 取 总账-勾稽明细
+
             if (result.compareTo(BigDecimal.ZERO) < 0) {
                 // 如果 为负数 总账 小于 勾稽明细