更新 GroupOrderPreInfoList 方法和视图模型

在 `GroupsController.cs` 中，修改了 `GroupOrderPreInfoList` 方法以支持新的搜索条件，并添加了对 `VisitCountryVal` 的查询。
在 `OrderPreInfoView.cs` 中，新增了 `VisitCountryVal` 属性，并实现了 `VisitCountrys` 属性以返回国家名称字符串。

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -407,9 +407,7 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GroupOrderPreInfoList(GroupOrderPreInfoListDto dto)
         {
-
-            
-
+            var search = dto.Search;
             RefAsync<int> total = 0;
             var list = await _sqlSugar.Queryable<Grp_OrderPreInfo>()
                 .LeftJoin<Sys_Users>((opi, u) => opi.CreateUserId == u.Id)
@@ -420,12 +418,13 @@ namespace OASystem.API.Controllers
                     Id = opi.Id,
                     Name = opi.Name,
                     UnitName = SqlFunc.Subqueryable<Grp_OrderPreItem>().Where(x => x.ParentId == opi.Id && x.FormTempId == 1).Select(x => x.Value),
+                    VisitCountryVal = SqlFunc.Subqueryable<Grp_OrderPreItem>().Where(x => x.ParentId == opi.Id && x.FormTempId == 2).Select(x => x.Value),
                     VisitDays = SqlFunc.Subqueryable<Grp_OrderPreItem>().Where(x => x.ParentId == opi.Id && x.FormTempId == 4).Select(x => x.Value),
                     VisiPpNum = SqlFunc.Subqueryable<Grp_OrderPreItem>().Where(x => x.ParentId == opi.Id && x.FormTempId == 6).Select(x => x.Value),
                     Operator = u.CnName,
                     OperationTime = opi.CreateTime
                 })
-                .WhereIF(!string.IsNullOrEmpty(dto.Search), x => x.Name.Contains(dto.Search) || x.UnitName.Contains(dto.Search))
+                .WhereIF(!string.IsNullOrEmpty(search), x => x.Name.Contains(search) || x.UnitName.Contains(search) || x.VisitCountrys.Contains(search))
                 .ToPageListAsync(dto.PageIndex, dto.PageSize, total);
 
             var infoIds = list.Select(x => x.Id).ToList();

OASystem/OASystem.Domain/ViewModels/Groups/OrderPreInfoView.cs

@@ -26,6 +26,27 @@ namespace OASystem.Domain.ViewModels.Groups
 
         public string UnitName { get; set; }
 
+        public string VisitCountryVal { get; set; }
+
+        public string VisitCountrys
+        {
+            get
+            {
+                var val = "-";
+
+                try
+                {
+
+                    var countryArr = JsonConvert.DeserializeObject<string[]>(VisitCountryVal);
+
+                    if (countryArr.Any()) val = string.Join("、", countryArr);
+                }
+                catch (Exception) { }
+
+                return val;
+            }
+        }
+
         public string VisitDays { get; set; }
 
         public string VisiPpNum { get; set; }