From c611663e387949c48c37587a0a291f2ed1eb92a6 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周二, 23 4月 2024 15:51:17 +0800 Subject: [PATCH] 修复 打印模板 处理枚举类型的问题 --- iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/SysEnumDataService.cs | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/SysEnumDataService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/SysEnumDataService.cs index ac6653f..33c491a 100644 --- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/SysEnumDataService.cs +++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/System/Enum/SysEnumDataService.cs @@ -6,6 +6,7 @@ using Furion.FriendlyException; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using System.Linq; namespace Admin.NET.Application { @@ -41,6 +42,52 @@ } /// <summary> + /// 閫氳繃鏋氫妇绫诲瀷鑾峰彇鏋氫妇鍊煎瓧绗︿覆闆嗗悎 + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [HttpGet("sysEnumData/getEnumDataListStrAsync")] + public async Task<string> GetEnumDataListStrAsync([FromQuery] EnumDataInput input) + { + // 鏌ユ壘鏋氫妇 + var enumType = App.EffectiveTypes.FirstOrDefault(t => t.IsEnum && t.Name == input.EnumName); + if (enumType == null) + throw Oops.Oh(ErrorCode.D1502).StatusCode(405); + + // 鑾峰彇鏋氫妇鐨凨ey鍜屾弿杩� + List<EnumDataOutput> retList = await Task.Run(() => EnumUtil.GetEnumDescDictionary(enumType) + .Select(x => new EnumDataOutput + { + Code = x.Key, + Value = x.Value + }).ToList()); + return string.Join(",", retList.Select(x => x.Value).ToList()); + } + + /// <summary> + /// 閫氳繃鏋氫妇绫诲瀷鑾峰彇鏋氫妇鍊煎瓧绗︿覆闆嗗悎 + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [HttpGet("sysEnumData/getEnumDataListStr")] + public string GetEnumDataListStr([FromQuery] EnumDataInput input) + { + // 鏌ユ壘鏋氫妇 + var enumType = App.EffectiveTypes.FirstOrDefault(t => t.IsEnum && t.Name == input.EnumName); + if (enumType == null) + throw Oops.Oh(ErrorCode.D1502).StatusCode(405); + + // 鑾峰彇鏋氫妇鐨凨ey鍜屾弿杩� + List<EnumDataOutput> retList = EnumUtil.GetEnumDescDictionary(enumType) + .Select(x => new EnumDataOutput + { + Code = x.Key, + Value = x.Value + }).ToList(); + return string.Join(",", retList.Select(x => x.Value).ToList()); + } + + /// <summary> /// 閫氳繃瀹炰綋瀛楁绫诲瀷鑾峰彇鐩稿叧闆嗗悎锛堢洰鍓嶄粎鏀寔鏋氫妇绫诲瀷锛� /// </summary> /// <param name="input"></param> -- Gitblit v1.9.3