Merge pull request #396 from dataease/pr@v1.1@fix_底层sql逻辑

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

@@ -129,7 +129,7 @@ public class DorisQueryProvider extends QueryProvider {
         }
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
-        ST st_sql = stg.getInstanceOf("querySql");
+        ST st_sql = stg.getInstanceOf("previewSql");
         st_sql.add("isGroup", isGroup);
         if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);

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

@@ -127,7 +127,7 @@ public class MysqlQueryProvider extends QueryProvider {
         }
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
-        ST st_sql = stg.getInstanceOf("querySql");
+        ST st_sql = stg.getInstanceOf("previewSql");
         st_sql.add("isGroup", isGroup);
         if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);

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

@@ -100,7 +100,7 @@ public class OracleQueryProvider extends QueryProvider {
         List<SQLObj> xFields = xFields(table, fields);
 
         STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
-        ST st_sql = stg.getInstanceOf("querySql");
+        ST st_sql = stg.getInstanceOf("previewSql");
         st_sql.add("isGroup", isGroup);
         if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
         if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);

backend/src/main/resources/sql/sqlTemplate.stg

-querySql(groups, aggregators, filters, orders, table, isGroup)
+querySql(groups, aggregators, filters, orders, table)
+::=<<
+SELECT
+<if(!groups && !aggregators)>
+    *
+<endif>
+<if(groups)>
+    <groups:{group|<if(group)><group.fieldName> AS <group.fieldAlias><endif>}; separator=",\n">
+<endif>
+    <if(groups && aggregators)>,<endif>
+<if(aggregators)>
+    <aggregators:{agg|<if(agg)><agg.fieldName> AS <agg.fieldAlias><endif>}; separator=",\n">
+<endif>
+FROM
+    <table.tableName>   <table.tableAlias>
+<if(filters)>
+WHERE
+    <filters:{filter|<if(filter)><filter.whereField> <filter.whereTermAndValue><endif>}; separator="\nAND ">
+<endif>
+<if(groups)>
+GROUP BY
+    <groups:{group|<if(group)><group.fieldName><endif>}; separator=",\n">
+<endif>
+<if(orders)>
+ORDER BY
+    <orders:{order|<if(order)><order.orderAlias> <order.orderDirection><endif>}; separator=",\n">
+<endif>
+>>
+
+
+previewSql(groups, aggregators, filters, orders, table, isGroup)
 ::=<<
 SELECT
 <if(!groups && !aggregators)>