Sfoglia il codice sorgente

重构数据映射并新增分类信息视图类

在 `GroupsController.cs` 中,修改了 `wordTypeData` 和 `excelTypeData` 的处理方式,使用 `EecSetDataInfoView` 类进行数据映射,并添加了 `ParentId` 属性。新增了 `groupNameList` 对象并将其添加到 `fileTypes` 列表中,最后对 `fileTypes` 进行了排序,返回的 JSON 数据结构中将 `WordTypeData` 和 `ExcelTypeData` 替换为 `FileTypeData`。

在 `SetDataView.cs` 中,新增了 `EecSetDataInfoView` 类,包含 `ParentId`、`Id` 和 `Name` 属性,用于表示分类信息。
LEIYI 2 mesi fa
parent
commit
4ea591b265

+ 23 - 6
OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -9178,19 +9178,36 @@ FROM
             //SetDataInfoView
             var dataSource = await _sqlSugar.SqlQueryable<Sys_SetData>(sql).ToListAsync();
 
-            var wordTypeData = dataSource.Where(it => it.STid == 72).ToList();  //三公费用-Word明细类型
-            List<SetDataInfoView> _WordTypeData = _mapper.Map<List<SetDataInfoView>>(wordTypeData);
+            var fileTypes = new List<EecSetDataInfoView>();
 
-            var excelTypeData = dataSource.Where(it => it.STid == 73).ToList(); //三公费用-Excel明细类型
-            List<SetDataInfoView> _ExcelTypeData = _mapper.Map<List<SetDataInfoView>>(excelTypeData);
+            var wordTypeData = dataSource.Where(it => it.STid == 72).Select(x => new EecSetDataInfoView() { 
+                ParentId = 1,
+                Id = x.Id,
+                Name = x.Name
+            
+            }) .ToList();  //三公费用-Word明细类型
+            if (wordTypeData.Any()) fileTypes.AddRange(wordTypeData);
+
+            var excelTypeData = dataSource.Where(it => it.STid == 73)
+                .Select(x => new EecSetDataInfoView()
+            {
+                ParentId = 2,
+                Id = x.Id,
+                Name = x.Name
+            }).ToList(); //三公费用-Excel明细类型
+            if (excelTypeData.Any()) fileTypes.AddRange(excelTypeData);
+
+            var groupNameList = new EecSetDataInfoView() { ParentId = 3, Id = 1, Name = "团组成员名单" };
+            fileTypes.Add(groupNameList);
+
+            fileTypes = fileTypes.OrderBy(x => x.ParentId).ThenBy(x => x.Id).ToList();
 
             //默认币种显示
             var _currencyInfos = await EnterExitCostMobileGetCurrencyInit();
             var viewPermissionData = await _enterExitCostRep.PermissionViewUsersAsync();
             return Ok(JsonView(true, "查询成功!", new
             {
-                WordTypeData = _WordTypeData,
-                ExcelTypeData = _ExcelTypeData,
+                FileTypeData = fileTypes,
                 CurrencyInit = _currencyInfos,
                 viewPermissionData = viewPermissionData
             }));

+ 12 - 0
OASystem/OASystem.Domain/ViewModels/System/SetDataView.cs

@@ -46,6 +46,18 @@ namespace OASystem.Domain.ViewModels.System
         }
     }
 
+
+    public class EecSetDataInfoView 
+    {
+        public int ParentId { get; set; }
+
+        public int Id { get; set; }
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string Name { get; set; }
+    }
+
     /// <summary>
     /// 卡类型数据data
     /// </summary>