起始数据返回字段逻辑调整

条件表编辑增加配置

Model/Database/PriReturnField.cs

@@ -62,7 +62,7 @@ namespace Model
         /// <summary>
         /// 字段名
         /// </summary>
-        [SugarColumn(ColumnDescription = "字段名", Length = 50, ColumnName = "field_en_name")]
+        [SugarColumn(ColumnDescription = "字段名", Length = 200, ColumnName = "field_en_name")]
         public string? fieldEnName { get; set; }
 
 

Model/Vo/Admin/GetPriQueryTableListVo.cs

@@ -25,6 +25,18 @@ namespace Vo.Admin
         public string summary { get; set; }
 
 
+        /// <summary>
+        /// 起始数据
+        /// </summary>
+        public bool startDataFlag { get; set; }
+
+
+        /// <summary>
+        /// 每次读取数量
+        /// </summary>
+        public int stepCount { get; set; }
+
+
 
     }
 }

Model/Vo/Admin/GetPriQueryTableQueryVo.cs

@@ -37,6 +37,18 @@ namespace Vo.Admin
         public int databaseId { get; set; }
 
 
+        /// <summary>
+        /// 起始数据
+        /// </summary>
+        public bool startDataFlag { get; set; }
+
+
+        /// <summary>
+        /// 每次读取数量
+        /// </summary>
+        public int stepCount { get; set; }
+
+
 
     }
 }

Util/PrizeDo.cs

@@ -410,15 +410,15 @@ namespace Util
                 {
                     if(returnField.fieldReturnKind == "2")
                     {
-                        fields += "count(" + returnField.fieldEnName + ") " + queryTable.tableEnName + "_" + returnField.fieldEnName + ",";
+                        fields += "count(" + returnField.fieldEnName + ") " + queryTable.tableEnName + "_" + returnField.fieldEnName.Split('+')[0] + ",";
                     }
                     else if(returnField.fieldReturnKind == "3")
                     {
-                        fields += "sum(" + returnField.fieldEnName + ") " + queryTable.tableEnName + "_" + returnField.fieldEnName + ",";
+                        fields += "sum(" + returnField.fieldEnName + ") " + queryTable.tableEnName + "_" + returnField.fieldEnName.Split('+')[0] + ",";
                     }
                     else if(returnField.fieldReturnKind == "4")
                     {
-                        fields += "avg(" + returnField.fieldEnName + ") " + queryTable.tableEnName + "_" + returnField.fieldEnName + ",";
+                        fields += "avg(" + returnField.fieldEnName + ") " + queryTable.tableEnName + "_" + returnField.fieldEnName.Split('+')[0] + ",";
                     }
                     else
                     {
@@ -648,7 +648,7 @@ namespace Util
                     if(queryField.groupByFlag) groupBy += queryField.fieldEnName +",";
                 }
 
-                if(!string.IsNullOrEmpty(groupBy)) groupBy = " group by " + groupBy.TrimEnd(',');
+                if(!string.IsNullOrEmpty(groupBy)) groupBy = " group by " + groupBy.TrimEnd(',') + " order by " + groupBy.TrimEnd(',');
 
                 var db = initDb(queryTable.databaseId);
                 string sql = "select " + fields + " from " + queryTable.tableEnName + " where 1=1" + condi + groupBy + " limit " + skip + "," + size;