From c6acbb21dc2061f3f380c5a491a06165624d90d7 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 30 May 2022 14:38:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 2 +- .../Service/Common/DTO/DictionaryModel.cs | 24 +++++++++---------- .../Service/Common/DictionaryService.cs | 4 ++-- .../Service/Common/FrontAuditConfigService.cs | 2 +- .../Service/Common/_MapConfig.cs | 3 +-- IRaCIS.Core.Domain/Common/Dictionary.cs | 3 --- 6 files changed, 17 insertions(+), 21 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 65876cf38..16efecd4b 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1852,7 +1852,7 @@ - New 查询条件 IsConfig 代表是字典类型配置项 否就是我们普通的项 和普通项的子项 + New 查询条件 diff --git a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs index 745d0ec95..70302bfb6 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs @@ -15,7 +15,6 @@ namespace IRaCIS.Application.Contracts public string ConfigType { get; set; } = String.Empty; - public string ConfigTypeDes { get; set; } = String.Empty; } @@ -25,18 +24,17 @@ namespace IRaCIS.Application.Contracts public string Code { get; set; } = String.Empty; - public string KeyName { get; set; } = String.Empty; public string Description { get; set; } = String.Empty; - public string ChildGroup { get; set; } = String.Empty; - public string Value { get; set; } = String.Empty; public string ValueCN { get; set; } = String.Empty; + public string ChildGroup { get; set; } = String.Empty; + public int ChildCodeEnum { get; set; } @@ -48,9 +46,9 @@ namespace IRaCIS.Application.Contracts public bool IsEnable { get; set; } - - //默认不是字典项 类型配置 - public bool IsConfig { get; set; } + + + public DicDataTypeEnum? DataTypeEnum { get; set; } //是配置的话，就有值 public Guid? ConfigTypeId { get; set; } @@ -60,17 +58,20 @@ namespace IRaCIS.Application.Contracts public class BasicDicSelect { public Guid Id { get; set; } - public string ValueCN { get; set; } = string.Empty; - public string Value { get; set; } = string.Empty; public string Code { get; set; } = string.Empty; - public string ChildGroup { get; set; } = string.Empty; + + public string ValueCN { get; set; } = string.Empty; + public string Value { get; set; } = string.Empty; + public int ShowOrder { get; set; } public Guid? ParentId { get; set; } public string ParentCode { get; set; } = string.Empty; + public string ChildGroup { get; set; } = string.Empty; + public int? ParentChildCodeEnum { get; set; } } @@ -79,9 +80,8 @@ namespace IRaCIS.Application.Contracts { public string? Code { get; set; } - public string? KeyName { get; set; } - public bool? IsConfig { get; set; } + public DicDataTypeEnum? DataTypeEnum { get; set; } public Guid? ConfigTypeId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs index f2ef89ff2..f48441630 100644 --- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs +++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs @@ -32,7 +32,7 @@ namespace IRaCIS.Application.Services /// - /// New 查询条件 IsConfig 代表是字典类型配置项 否就是我们普通的项 和普通项的子项 + /// New 查询条件 /// /// /// @@ -43,7 +43,7 @@ namespace IRaCIS.Application.Services var systemBasicDataQueryable = _dicRepository.Where(t => t.ParentId == null) .WhereIf(!string.IsNullOrEmpty(basicDicQuery.Code), t => t.Code.Contains(basicDicQuery.Code!)) .WhereIf(basicDicQuery.ConfigTypeId != null, t => t.ConfigTypeId == basicDicQuery.ConfigTypeId!) - .WhereIf(basicDicQuery.IsConfig != null, t => t.IsConfig == basicDicQuery.IsConfig) + .WhereIf(basicDicQuery.DataTypeEnum != null, t => t.DataTypeEnum == basicDicQuery.DataTypeEnum) .ProjectTo(_mapper.ConfigurationProvider); diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs index c95e6ff52..0d07fd5ff 100644 --- a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs @@ -608,7 +608,7 @@ namespace IRaCIS.Core.Application.Service CreateTime = DateTime.Now, Description = lst.Select(x => x.Description).FirstOrDefault(), EnumList = lst.Select(x => x.EnumList).FirstOrDefault(), - IsConfig = lst.Select(x => x.IsConfig).FirstOrDefault(), + //IsConfig = lst.Select(x => x.IsConfig).FirstOrDefault(), IsShowParent = lst.Select(x => x.IsShowParent).FirstOrDefault(), ParentId = item.AddItem, CreateUserId = _userInfo.Id, diff --git a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs index 145710b88..fee1b7589 100644 --- a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs @@ -33,8 +33,7 @@ namespace IRaCIS.Core.Application.Service CreateMap() - .ForMember(o => o.ConfigType, t => t.MapFrom(u => u.ConfigDictionary.Code)) - .ForMember(o => o.ConfigTypeDes, t => t.MapFrom(u => u.ConfigDictionary.Description)); + .ForMember(o => o.ConfigType, t => t.MapFrom(u => u.ConfigDictionary.Code)); CreateMap().ReverseMap(); diff --git a/IRaCIS.Core.Domain/Common/Dictionary.cs b/IRaCIS.Core.Domain/Common/Dictionary.cs index 2aab8b731..805f6c652 100644 --- a/IRaCIS.Core.Domain/Common/Dictionary.cs +++ b/IRaCIS.Core.Domain/Common/Dictionary.cs @@ -45,9 +45,6 @@ namespace IRaCIS.Core.Domain.Models public bool IsEnable { get; set; } - - public bool IsConfig { get; set; } - public Guid? ConfigTypeId { get; set; }