调整领导人达标奖励逻辑

Program.cs

@@ -130,9 +130,9 @@ app.Urls.Add("http://*:5802");
 // PrizeDo.sendPrize("QUEUE_KXS_PRIZE_MALL_CONFIG_DIVISION", "{\"order_id\":602804,\"user_id\":264331}");
 // PrizeDo.sendPrize(7, "{\"OrderNo\":\"BM2024090817330511847441249\"}");
 // PrizeDo.sendPrize(7, "{\"OrderNo\":\"BM2024090817360962275551251\"}");
-PrizeDo.sendPrize("KXS_LEADER_STA_PRIZE", "{\"month\":\"202411\"}");
+// PrizeDo.sendPrize("KXS_LEADER_STA_PRIZE", "{\"month\":\"202411\"}");
 
-// RabbitMQClient.Instance.Start();
+RabbitMQClient.Instance.Start();
 
 // CopyProject.Copy(5, 7);
 

Util/PrizeDo.cs

@@ -526,29 +526,31 @@ 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 = tableEnName + "_" + returnField.fieldEnName.Split('+')[0];
                         if(returnField.fieldReturnKind == "2")
                         {
-                            fields += "count(" + returnField.fieldEnName + ") " + tableEnName + "_" + returnField.fieldEnName.Split('+')[0] + ",";
+                            fields += "count(" + returnField.fieldEnName + ") " + aliasName + ",";
                         }
                         else if(returnField.fieldReturnKind == "3")
                         {
-                            fields += "sum(" + returnField.fieldEnName + ") " + tableEnName + "_" + returnField.fieldEnName.Split('+')[0] + ",";
+                            fields += "sum(" + returnField.fieldEnName + ") " + aliasName + ",";
                         }
                         else if(returnField.fieldReturnKind == "4")
                         {
-                            fields += "avg(" + returnField.fieldEnName + ") " + tableEnName + "_" + returnField.fieldEnName.Split('+')[0] + ",";
+                            fields += "avg(" + returnField.fieldEnName + ") " + aliasName + ",";
                         }
                         else if(returnField.fieldReturnKind == "5")
                         {
-                            fields += "max(" + returnField.fieldEnName + ") " + tableEnName + "_" + returnField.fieldEnName.Split('+')[0] + ",";
+                            fields += "max(" + returnField.fieldEnName + ") " + aliasName + ",";
                         }
                         else if(returnField.fieldReturnKind == "6")
                         {
-                            fields += "min(" + returnField.fieldEnName + ") " + tableEnName + "_" + returnField.fieldEnName.Split('+')[0] + ",";
+                            fields += "min(" + returnField.fieldEnName + ") " + aliasName + ",";
                         }
                         else
                         {
-                            fields += returnField.fieldEnName + " " + tableEnName + "_" + returnField.fieldEnName + ",";
+                            fields += returnField.fieldEnName + " " + aliasName + ",";
                         }
                         fieldDic.Add(tableEnName + "_" + returnField.fieldEnName, returnField.fieldName);
                     }
@@ -1094,6 +1096,7 @@ namespace Util
                 }
                 catch(Exception ex)
                 {
+                    Function.WriteLog(ex.ToString(), "errlog");
                     setLogFieldValue(sub.id, "errLog", ex.ToString());
                 }
             }
@@ -1198,7 +1201,7 @@ namespace Util
                                                 {
                                                     string val = GetQueryTableData(condiDic, returnField);
                                                     if(val == returnField) val = "0";
-                                                    expresssion = expresssion.Replace(returnField, val);
+                                                    expresssion = expresssion.Replace(returnField, Function.CheckInt(val));
 
                                                     string title = GetQueryTableTitle(condiDic, returnField);
                                                     checkTitle = checkTitle.Replace(returnField, title);
@@ -1610,7 +1613,7 @@ namespace Util
                         foreach(string returnField in returnFields)
                         {
                             string val = GetQueryTableData(condiDic, returnField);
-                            expresssion = expresssion.Replace(returnField, val);
+                            expresssion = expresssion.Replace(returnField, Function.CheckInt(val));
 
                             string title = GetQueryTableTitle(condiDic, returnField);
                             checkTitle = checkTitle.Replace(returnField, title);
@@ -2438,7 +2441,7 @@ namespace Util
                             {
                                 string val = GetStartData(startData, text);
                                 if(string.IsNullOrEmpty(val)) val = GetQueryTableData(condiDic, text);
-                                fieldQueryValue = fieldQueryValue.Replace(text, val);
+                                fieldQueryValue = fieldQueryValue.Replace(text, Function.CheckInt(val));
                             }
                             DataTable dt = new();
                             fieldQueryValue = dt.Compute(fieldQueryValue, "false").ToString();
@@ -2460,8 +2463,8 @@ namespace Util
                             foreach (string text in texts)
                             {
                                 string val = GetStartData(startData, text);
-                                if(string.IsNullOrEmpty(val)) val = GetQueryTableData(condiDic, text);
-                                fieldQueryValue = fieldQueryValue.Replace(text, val);
+                                if(string.IsNullOrEmpty(val) || val == text) val = GetQueryTableData(condiDic, text);
+                                fieldQueryValue = fieldQueryValue.Replace(text, Function.CheckInt(val));
                             }
                             DataTable dt = new();
                             fieldQueryValue = dt.Compute(fieldQueryValue, "false").ToString();
@@ -2493,7 +2496,7 @@ namespace Util
                                 {
                                     string val = GetStartData(startData, text);
                                     if(string.IsNullOrEmpty(val)) val = GetQueryTableData(condiDic, text);
-                                    fieldQueryValue = fieldQueryValue.Replace(text, val);
+                                    fieldQueryValue = fieldQueryValue.Replace(text, Function.CheckInt(val));
                                 }
                             }
                             DataTable dt = new();
@@ -2869,7 +2872,7 @@ namespace Util
                     if(condiDic.Any(m => m.FieldEnName == returnField))
                     {
                         string val = GetQueryTableData(condiDic, returnField);
-                        expresssion = expresssion.Replace(returnField, val);
+                        expresssion = expresssion.Replace(returnField, Function.CheckInt(val));
                     }
                 }
                 DataTable dt = new();