Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -5533,27 +5533,26 @@ FROM
         }
         #endregion
 
+        /// <summary>
+        /// 世运会数据
+        /// </summary>
+        /// <returns></returns>
         [HttpGet]
         public IActionResult WorldGamesData()
         {
-            var setData = _sqlSugar.Queryable<Sys_SetData>()
-                                    .Where(x => x.IsDel == 0 && x.STid == 117)
-                                    .ToList();
-
+            var setData = _sqlSugar.Queryable<Grp_GamesBudgetMaster>().Where(x => x.IsDel == 0).ToList();
+            var groupMenu = setData.GroupBy(x => x.T0);
             var resultArr = new List<DecreasePaymentsWorldGamesDataView>();
 
-            foreach (var item in setData)
+            foreach (var item in groupMenu)
             {
                 resultArr.Add(new DecreasePaymentsWorldGamesDataView
                 {
                     Data = new SetDataView
                     {
-                        Id = item.Id,
-                        Name = item.Name,
-                        Remark = item.Remark,
-                        STid = item.STid,
+                        Name = item.Key
                     },
-                    Child = JsonConvert.DeserializeObject<List<string>>(item.Remark) ?? new List<string>()
+                    Child = item.Select(x => x.CalculationContent).ToList()
                 });
             }
 
@@ -5561,7 +5560,6 @@ FROM
         }
 
 
-
         #endregion
 
         #region 文件上传、删除