feat(视图): 过滤器支持and、or逻辑

backend/src/main/java/io/dataease/provider/query/QueryProvider.java

@@ -78,4 +78,16 @@ public abstract class QueryProvider {
     public String convertTableToSql(String tableName, Datasource ds) {
         return "select * from  TABLE_NAME".replace("TABLE_NAME", tableName);
     }
+
+    public String getLogic(String logic) {
+        if (logic != null) {
+            switch (logic) {
+                case "and":
+                    return "AND";
+                case "or":
+                    return "OR";
+            }
+        }
+        return "AND";
+    }
 }

backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java

@@ -1102,14 +1102,4 @@ public class CKQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }

backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java

@@ -1034,14 +1034,4 @@ public class Db2QueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }

backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java

@@ -1080,14 +1080,4 @@ public class DorisQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }

backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java

@@ -990,14 +990,4 @@ public class EsQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }

backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java

@@ -1055,14 +1055,4 @@ public class HiveQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }

backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java

@@ -944,14 +944,4 @@ public class MongoQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }

backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java

@@ -1058,14 +1058,4 @@ public class MysqlQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }

backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java

@@ -1131,14 +1131,4 @@ public class OracleQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }

backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java

@@ -1047,14 +1047,4 @@ public class PgQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }

backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java

@@ -974,14 +974,4 @@ public class RedshiftQueryProvider extends QueryProvider {
             return sql;
         }
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }

backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java

@@ -1089,14 +1089,4 @@ public class SqlserverQueryProvider extends QueryProvider {
         }
         return originField;
     }
-
-    private String getLogic(String logic) {
-        switch (logic) {
-            case "and":
-                return "AND";
-            case "or":
-                return "OR";
-        }
-        return "AND";
-    }
 }