Merge pull request #1057 from clementchong/hotfix-883

#883: Excel download data columns sequence is different from table visualisation

Author: scottsut

data-providers/src/main/java/datart/data/provider/calcite/SqlBuilder.java

@@ -157,20 +157,6 @@ public String build() throws SqlParseException {
             }
         }
 
-        // aggregators
-        if (!CollectionUtils.isEmpty(executeParam.getAggregators())) {
-            for (AggregateOperator aggregator : executeParam.getAggregators()) {
-                String alias;
-                if (aggregator.getSqlOperator() == null) {
-                    alias = aggregator.getColumn();
-                } else {
-                    alias = aggregator.getSqlOperator().name() + "(" + aggregator.getColumn() + ")";
-                }
-                columnAlias.put(aggregator.getColumn(), alias);
-                selectList.add(createAggNode(aggregator.getSqlOperator(), aggregator.getColumn(), alias));
-            }
-        }
-
         //group by
         if (!CollectionUtils.isEmpty(executeParam.getGroups())) {
             for (GroupByOperator group : executeParam.getGroups()) {
@@ -186,6 +172,20 @@ public String build() throws SqlParseException {
             }
         }
 
+        // aggregators
+        if (!CollectionUtils.isEmpty(executeParam.getAggregators())) {
+            for (AggregateOperator aggregator : executeParam.getAggregators()) {
+                String alias;
+                if (aggregator.getSqlOperator() == null) {
+                    alias = aggregator.getColumn();
+                } else {
+                    alias = aggregator.getSqlOperator().name() + "(" + aggregator.getColumn() + ")";
+                }
+                columnAlias.put(aggregator.getColumn(), alias);
+                selectList.add(createAggNode(aggregator.getSqlOperator(), aggregator.getColumn(), alias));
+            }
+        }
+
         //order
         if (!CollectionUtils.isEmpty(executeParam.getOrders())) {
             for (OrderOperator order : executeParam.getOrders()) {