备份

Model/Database/PriRecursionStartReturnField.cs

@@ -80,6 +80,13 @@ namespace Model
         public int objectTableId { get; set; }
 
 
+        /// <summary>
+        /// 字段别名
+        /// </summary>
+        [SugarColumn(ColumnDescription = "字段别名", Length = 50, ColumnName = "field_alias_name")]
+        public string? fieldAliasName { get; set; }
+
+
 
     }
 }

Model/Database/PriReturnField.cs

@@ -80,11 +80,11 @@ namespace Model
         public int queryTableId { get; set; }
 
 
-        // /// <summary>
-        // /// 聚合查询类型
-        // /// </summary>
-        // [SugarColumn(ColumnDescription = "聚合查询类型", ColumnName = "group_by_kind")]
-        // public string? groupByKind { get; set; }
+        /// <summary>
+        /// 字段别名
+        /// </summary>
+        [SugarColumn(ColumnDescription = "字段别名", Length = 50, ColumnName = "field_alias_name")]
+        public string? fieldAliasName { get; set; }
 
 
 

Model/Vo/Admin/GetPriRecursionStartReturnFieldListVo.cs

@@ -31,6 +31,12 @@ namespace Vo.Admin
         public string fieldReturnKind { get; set; }
 
 
+        /// <summary>
+        /// 字段别名
+        /// </summary>
+        public string fieldAliasName { get; set; }
+
+
 
     }
 }

Model/Vo/Admin/GetPriRecursionStartReturnFieldQueryVo.cs

@@ -37,6 +37,12 @@ namespace Vo.Admin
         public int objectTableId { get; set; }
 
 
+        /// <summary>
+        /// 字段别名
+        /// </summary>
+        public string fieldAliasName { get; set; }
+
+
 
     }
 }

Model/Vo/Admin/GetPriReturnFieldListVo.cs

@@ -37,10 +37,10 @@ namespace Vo.Admin
         public int queryTableId { get; set; }
 
 
-        // /// <summary>
-        // /// 聚合查询类型
-        // /// </summary>
-        // public string? groupByKind { get; set; }
+        /// <summary>
+        /// 字段别名
+        /// </summary>
+        public string fieldAliasName { get; set; }
 
 
 

Model/Vo/Admin/GetPriReturnFieldQueryVo.cs

@@ -37,10 +37,10 @@ namespace Vo.Admin
         public int queryTableId { get; set; }
 
 
-        // /// <summary>
-        // /// 聚合查询类型
-        // /// </summary>
-        // public string? groupByKind { get; set; }
+        /// <summary>
+        /// 字段别名
+        /// </summary>
+        public string fieldAliasName { get; set; }
 
 
 

Program.cs

@@ -131,7 +131,7 @@ app.Urls.Add("http://*:5802");
 // PrizeDo.sendPrize(7, "{\"OrderNo\":\"BM2024090817330511847441249\"}");
 // PrizeDo.sendPrize(7, "{\"OrderNo\":\"BM2024090817360962275551251\"}");
 
-RabbitMQClient.Instance.Start();
+// RabbitMQClient.Instance.Start();
 
 // PrizeDo.sendPrize("{\"prize_tag\":\"1\",\"content\":\"{\\\"PosSn\\\":\\\"00002402045980195457\\\"}\"}");
 

Util/PrizeDo.cs

@@ -89,23 +89,25 @@ namespace Util
                 var returnFields = returnFieldService.GetList(m => m.queryTableId == queryTable.id);
                 foreach(var returnField in returnFields)
                 {
+                    string aliasName = returnField.fieldAliasName;
+                    if(string.IsNullOrEmpty(aliasName)) aliasName = queryTable.tableEnName + "_" + returnField.fieldEnName;
                     if(returnField.fieldReturnKind == "2")
                     {
-                        fields += "count(" + returnField.fieldEnName + ") " + queryTable.tableEnName + "_" + returnField.fieldEnName + ",";
+                        fields += "count(" + returnField.fieldEnName + ") " + aliasName + ",";
                     }
                     else if(returnField.fieldReturnKind == "3")
                     {
-                        fields += "sum(" + returnField.fieldEnName + ") " + queryTable.tableEnName + "_" + returnField.fieldEnName + ",";
+                        fields += "sum(" + returnField.fieldEnName + ") " + aliasName + ",";
                     }
                     else if(returnField.fieldReturnKind == "4")
                     {
-                        fields += "avg(" + returnField.fieldEnName + ") " + queryTable.tableEnName + "_" + returnField.fieldEnName + ",";
+                        fields += "avg(" + returnField.fieldEnName + ") " + aliasName + ",";
                     }
                     else
                     {
-                        fields += returnField.fieldEnName + " " + queryTable.tableEnName + "_" + returnField.fieldEnName + ",";
+                        fields += returnField.fieldEnName + " " + aliasName + ",";
                     }
-                    fieldDic.Add(queryTable.tableEnName + "_" + returnField.fieldEnName, returnField.fieldName);
+                    fieldDic.Add(aliasName, returnField.fieldName);
                 }
                 fields = fields.TrimEnd(',');
 
@@ -1874,23 +1876,25 @@ namespace Util
                     fields = "";
                     foreach(var returnField in returnFields)
                     {
+                        string aliasName = returnField.fieldAliasName;
+                        if(string.IsNullOrEmpty(aliasName)) aliasName = queryTable.tableEnName + "_" + returnField.fieldEnName;
                         if(returnField.fieldReturnKind == "2")
                         {
-                            fields += "count(" + returnField.fieldEnName + ") " + queryTable.tableEnName + "_" + returnField.fieldEnName + ",";
+                            fields += "count(" + returnField.fieldEnName + ") " + aliasName + ",";
                         }
                         else if(returnField.fieldReturnKind == "3")
                         {
-                            fields += "sum(" + returnField.fieldEnName + ") " + queryTable.tableEnName + "_" + returnField.fieldEnName + ",";
+                            fields += "sum(" + returnField.fieldEnName + ") " + aliasName + ",";
                         }
                         else if(returnField.fieldReturnKind == "4")
                         {
-                            fields += "avg(" + returnField.fieldEnName + ") " + queryTable.tableEnName + "_" + returnField.fieldEnName + ",";
+                            fields += "avg(" + returnField.fieldEnName + ") " + aliasName + ",";
                         }
                         else
                         {
-                            fields += returnField.fieldEnName + " " + queryTable.tableEnName + "_" + returnField.fieldEnName + ",";
+                            fields += returnField.fieldEnName + " " + aliasName + ",";
                         }
-                        fieldDic.Add(queryTable.tableEnName + "_" + returnField.fieldEnName, returnField.fieldName);
+                        fieldDic.Add(aliasName, returnField.fieldName);
                     }
                     fields = fields.TrimEnd(',');
                 }