XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

删除字典废弃字段
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-09-19 13:24:56 +08:00
parent fb067534e7
commit 7df247d5e7
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
View File

@ -136,7 +136,6 @@ namespace IRaCIS.Application.Contracts
public Guid? ParentId { get; set; } public Guid? ParentId { get; set; }
public string ParentCode { get; set; } = string.Empty; public string ParentCode { get; set; } = string.Empty;
public int? ParentChildCodeEnum { get; set; }
public string ChildGroup { get; set; } = string.Empty; public string ChildGroup { get; set; } = string.Empty;

4
IRaCIS.Core.Application/Service/Common/DictionaryService.cs
View File

@ -407,7 +407,6 @@ namespace IRaCIS.Application.Services
ChildGroup = x.Dictionary.ChildGroup, ChildGroup = x.Dictionary.ChildGroup,
Code = x.Dictionary.Code, Code = x.Dictionary.Code,
DataTypeEnum = x.Dictionary.DataTypeEnum, DataTypeEnum = x.Dictionary.DataTypeEnum,
ParentChildCodeEnum = x.Dictionary.Parent.ChildCodeEnum,
ShowOrder = x.Dictionary.ShowOrder, ShowOrder = x.Dictionary.ShowOrder,
ParentCode = x.ParentCode, ParentCode = x.ParentCode,
CrterionDictionaryGroup = x.CrterionDictionaryGroup, CrterionDictionaryGroup = x.CrterionDictionaryGroup,
@ -427,7 +426,6 @@ namespace IRaCIS.Application.Services
ChildGroup = x.Dictionary.ChildGroup, ChildGroup = x.Dictionary.ChildGroup,
Code = x.Dictionary.Code, Code = x.Dictionary.Code,
DataTypeEnum = x.Dictionary.DataTypeEnum, DataTypeEnum = x.Dictionary.DataTypeEnum,
ParentChildCodeEnum = x.Dictionary.Parent.ChildCodeEnum,
ShowOrder = x.Dictionary.ShowOrder, ShowOrder = x.Dictionary.ShowOrder,
ParentCode = x.ParentCode, ParentCode = x.ParentCode,
CrterionDictionaryGroup = x.CrterionDictionaryGroup, CrterionDictionaryGroup = x.CrterionDictionaryGroup,
@ -521,7 +519,6 @@ namespace IRaCIS.Application.Services
Code = x.Dictionary.Code, Code = x.Dictionary.Code,
Description = x.Dictionary.Description, Description = x.Dictionary.Description,
DataTypeEnum = x.Dictionary.DataTypeEnum, DataTypeEnum = x.Dictionary.DataTypeEnum,
ParentChildCodeEnum = x.Dictionary.Parent.ChildCodeEnum,
ShowOrder = x.Dictionary.ShowOrder, ShowOrder = x.Dictionary.ShowOrder,
ParentCode = x.ParentCode, ParentCode = x.ParentCode,
Id = x.DictionaryId, Id = x.DictionaryId,
@ -565,7 +562,6 @@ namespace IRaCIS.Application.Services
Code = x.Dictionary.Code, Code = x.Dictionary.Code,
Description = x.Dictionary.Description, Description = x.Dictionary.Description,
DataTypeEnum = x.Dictionary.DataTypeEnum, DataTypeEnum = x.Dictionary.DataTypeEnum,
ParentChildCodeEnum = x.Dictionary.Parent.ChildCodeEnum,
ShowOrder = x.Dictionary.ShowOrder, ShowOrder = x.Dictionary.ShowOrder,
ParentCode = x.ParentCode, ParentCode = x.ParentCode,
Id = x.DictionaryId, Id = x.DictionaryId,

4
IRaCIS.Core.Application/Service/Common/_MapConfig.cs
View File

@ -52,12 +52,12 @@ namespace IRaCIS.Core.Application.Service
CreateMap<AddBasicDicChild, Dictionary>(); CreateMap<AddBasicDicChild, Dictionary>();
CreateMap<Dictionary, BasicDicSelectCopy>() CreateMap<Dictionary, BasicDicSelectCopy>()
.ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum)) //.ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum))
.ForMember(o => o.Value, t => t.MapFrom(u => isEn_Us ? u.Value : u.ValueCN)) .ForMember(o => o.Value, t => t.MapFrom(u => isEn_Us ? u.Value : u.ValueCN))
.ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code)); .ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code));
CreateMap<Dictionary, BasicDicSelect>() CreateMap<Dictionary, BasicDicSelect>()
.ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum)) //.ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum))
.ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code)); .ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code));
var token = ""; var token = "";

1
IRaCIS.Core.Domain/Common/Dictionary.cs
View File

@ -29,7 +29,6 @@ namespace IRaCIS.Core.Domain.Models
public string ChildGroup { get; set; } = string.Empty; public string ChildGroup { get; set; } = string.Empty;
public int ChildCodeEnum { get; set; }
public DicDataTypeEnum DataTypeEnum { get; set; } public DicDataTypeEnum DataTypeEnum { get; set; }