|
@@ -249,7 +249,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
|
|
|
for (int i = 0; i < dimensionData.size(); i++) {
|
|
|
JSONObject obj = dimensionData.getJSONObject(i);
|
|
|
String value = obj.getString(ruleBase.getIndicatorCode());
|
|
|
- if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, obj)) {
|
|
|
+ if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, obj, ruleBase.getIndicatorCode())) {
|
|
|
complianceList.add(obj);
|
|
|
}
|
|
|
}
|
|
@@ -329,7 +329,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
|
|
|
//账户维度数据
|
|
|
if (ACCOUNT.equals(ruleBase.getRuleDimension())) {
|
|
|
JSONObject accountEntity = dimensionData.getJSONObject(0);
|
|
|
- if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, accountEntity.getString(ruleBase.getIndicatorCode()), accountEntity)) {
|
|
|
+ if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, accountEntity.getString(ruleBase.getIndicatorCode()), accountEntity, ruleBase.getIndicatorCode())) {
|
|
|
if (Check.isNull(accountDatas)) {
|
|
|
accountDatas.add(accountEntity);
|
|
|
}
|
|
@@ -461,7 +461,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
|
|
|
for (int i = 0; i < ruleDatas.size(); i++) {
|
|
|
JSONObject targetEntity = ruleDatas.getJSONObject(i);
|
|
|
String value = targetEntity.getString(ruleBase.getIndicatorCode());
|
|
|
- if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, targetEntity)) {
|
|
|
+ if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, targetEntity, ruleBase.getIndicatorCode())) {
|
|
|
okData.add(targetEntity);
|
|
|
}
|
|
|
}
|
|
@@ -470,7 +470,7 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
|
|
|
for (int i = 0; i < dimensionData.size(); i++) {
|
|
|
JSONObject targetEntity = dimensionData.getJSONObject(i);
|
|
|
String value = targetEntity.getString(ruleBase.getIndicatorCode());
|
|
|
- if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, targetEntity)) {
|
|
|
+ if (MatchLogic.matchCondition(indicator, ruleBase.getRuleCondition(), threshold, value, targetEntity, ruleBase.getIndicatorCode())) {
|
|
|
ruleDatas.add(targetEntity);
|
|
|
}
|
|
|
}
|