添加条件匹配表说明

Model/Database/PriQueryTable.cs

@@ -59,6 +59,13 @@ namespace Model
         public string? tableEnName { get; set; }
 
 
+        /// <summary>
+        /// 说明
+        /// </summary>
+        [SugarColumn(ColumnDescription = "说明", Length = 50, ColumnName = "summary")]
+        public string? summary { get; set; }
+
+
         /// <summary>
         /// 项目
         /// </summary>

Model/Vo/Admin/GetPriQueryTableListVo.cs

@@ -19,6 +19,12 @@ namespace Vo.Admin
         public string tableEnName { get; set; }
 
 
+        /// <summary>
+        /// 说明
+        /// </summary>
+        public string summary { get; set; }
+
+
 
     }
 }

Model/Vo/Admin/GetPriQueryTableQueryVo.cs

@@ -19,6 +19,12 @@ namespace Vo.Admin
         public string tableEnName { get; set; }
 
 
+        /// <summary>
+        /// 说明
+        /// </summary>
+        public string summary { get; set; }
+
+
         /// <summary>
         /// 项目
         /// </summary>

Program.cs

@@ -119,6 +119,6 @@ app.MapControllerRoute(
 
 app.MapControllers();
 
-PrizeDo.sendPrize("{\"PosSn\":\"CS00000000004720\"}");
+// PrizeDo.sendPrize("{\"PosSn\":\"CS00000000004720\"}");
 
 app.Run();

Util/PrizeDo.cs

@@ -126,6 +126,43 @@ namespace Util
                             condi += val;
                         }
                     }
+                    else if(fieldQueryKind == "4") //数组匹配
+                    {
+                        condi += " and " + fieldEnName + " in (";
+                        string val = "";
+                        string[] valList = fieldQueryValue.Split(',');
+                        if(fieldQueryModel == "request_param")
+                        {
+                            Dictionary<string, string> req = getRequestParams(projectId, content);
+                            foreach(string sub in valList)
+                            {
+                                if(fieldQueryValueType == "text")
+                                {
+                                    val += "'" + req[sub] + "',";
+                                }
+                                else
+                                {
+                                    val += req[sub] + ",";
+                                }
+                            }
+                        }
+                        else if(fieldQueryModel == "fixed_value")
+                        {
+                            foreach(string sub in valList)
+                            {
+                                if(fieldQueryValueType == "text")
+                                {
+                                    val += "'" + GetExpressionVal(sub) + "',";
+                                }
+                                else
+                                {
+                                    val += GetExpressionVal(sub) + ",";
+                                }
+                            }
+                        }
+                        val = val.TrimEnd(',');
+                        condi += val + ")";
+                    }
                     else if(fieldQueryKind == "3") //范围匹配
                     {
                         string[] val = fieldQueryValue.Split(':');
@@ -249,6 +286,43 @@ namespace Util
                     }
                     condi += val;
                 }
+                else if(fieldQueryKind == "4") //数组匹配
+                {
+                    condi += " and " + fieldEnName + " in (";
+                    string val = "";
+                    string[] valList = fieldQueryValue.Split(',');
+                    if(fieldQueryModel == "request_param")
+                    {
+                        Dictionary<string, string> req = getRequestParams(projectId, content);
+                        foreach(string sub in valList)
+                        {
+                            if(fieldQueryValueType == "text")
+                            {
+                                val += "'" + req[sub] + "',";
+                            }
+                            else
+                            {
+                                val += req[sub] + ",";
+                            }
+                        }
+                    }
+                    else if(fieldQueryModel == "fixed_value")
+                    {
+                        foreach(string sub in valList)
+                        {
+                            if(fieldQueryValueType == "text")
+                            {
+                                val += "'" + GetExpressionVal(sub) + "',";
+                            }
+                            else
+                            {
+                                val += GetExpressionVal(sub) + ",";
+                            }
+                        }
+                    }
+                    val = val.TrimEnd(',');
+                    condi += val + ")";
+                }
                 else if(fieldQueryKind == "3") //范围匹配
                 {
                     string[] val = fieldQueryValue.Split(':');
@@ -583,6 +657,43 @@ namespace Util
                         }
                         condi += val;
                     }
+                    else if(fieldQueryKind == "4") //数组匹配
+                    {
+                        condi += " and " + fieldEnName + " in (";
+                        string val = "";
+                        string[] valList = fieldQueryValue.Split(',');
+                        if(fieldQueryModel == "request_param")
+                        {
+                            Dictionary<string, string> req = getRequestParams(projectId, content);
+                            foreach(string subval in valList)
+                            {
+                                if(fieldQueryValueType == "text")
+                                {
+                                    val += "'" + req[subval] + "',";
+                                }
+                                else
+                                {
+                                    val += req[subval] + ",";
+                                }
+                            }
+                        }
+                        else if(fieldQueryModel == "fixed_value")
+                        {
+                            foreach(string subval in valList)
+                            {
+                                if(fieldQueryValueType == "text")
+                                {
+                                    val += "'" + GetExpressionVal(subval) + "',";
+                                }
+                                else
+                                {
+                                    val += GetExpressionVal(subval) + ",";
+                                }
+                            }
+                        }
+                        val = val.TrimEnd(',');
+                        condi += val + ")";
+                    }
                     else if(fieldQueryKind == "3") //范围匹配
                     {
                         string[] val = fieldQueryValue.Split(':');
@@ -724,6 +835,43 @@ namespace Util
                         }
                         condi += val;
                     }
+                    else if(fieldQueryKind == "4") //数组匹配
+                    {
+                        condi += " and " + fieldEnName + " in (";
+                        string val = "";
+                        string[] valList = fieldQueryValue.Split(',');
+                        if(fieldQueryModel == "request_param")
+                        {
+                            Dictionary<string, string> req = getRequestParams(projectId, content);
+                            foreach(string sub in valList)
+                            {
+                                if(fieldQueryValueType == "text")
+                                {
+                                    val += "'" + req[sub] + "',";
+                                }
+                                else
+                                {
+                                    val += req[sub] + ",";
+                                }
+                            }
+                        }
+                        else if(fieldQueryModel == "fixed_value")
+                        {
+                            foreach(string sub in valList)
+                            {
+                                if(fieldQueryValueType == "text")
+                                {
+                                    val += "'" + GetExpressionVal(sub) + "',";
+                                }
+                                else
+                                {
+                                    val += GetExpressionVal(sub) + ",";
+                                }
+                            }
+                        }
+                        val = val.TrimEnd(',');
+                        condi += val + ")";
+                    }
                     else if(fieldQueryKind == "3") //范围匹配
                     {
                         string[] val = fieldQueryValue.Split(':');