Browse Source

数据预处理,数据过滤调整

MaiXinRong 1 year ago
parent
commit
5a0a406bdc
1 changed files with 6 additions and 1 deletions
  1. 6 1
      app/lib/rpt_data_analysis.js

+ 6 - 1
app/lib/rpt_data_analysis.js

@@ -45,11 +45,12 @@ const valueCheck = {
                 return !ctx.helper._.isNil(value) ? value >= condition.value : false;
             case '<=':
                 return !ctx.helper._.isNil(value) ? value <= condition.value : false;
+            case '!=':
             default:
                 return true;
         }
     },
-    _checkString(ctx, value, condition) {
+    _checkStringFit(ctx, value, condition) {
         switch (condition.operate) {
             case '=':
                 return value === condition.value;
@@ -61,6 +62,10 @@ const valueCheck = {
                 return true;
         }
     },
+    _checkString(ctx, value, condition) {
+        const result = this._checkStringFit(ctx, value, condition);
+        return condition.opp ? !result : result;
+    },
     loadTypeFun(condition) {
         for (const c of condition) {
             c.fun = this._typeFun[c.type];