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

修改字典

Uat_Study
hang 2022-05-30 14:38:50 +08:00
parent 316c9f779b
commit c6acbb21dc
6 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -1852,7 +1852,7 @@
</member>
<member name="M:IRaCIS.Application.Services.DictionaryService.GetBasicDicList(IRaCIS.Application.Contracts.BasicDicQuery)">
<summary>
New 查询条件 IsConfig 代表是字典类型配置项 否就是我们普通的项 和普通项的子项
New 查询条件
</summary>
<param name="basicDicQuery"></param>
<returns></returns>

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

@ -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; }
@ -49,8 +47,8 @@ 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; }

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

@ -32,7 +32,7 @@ namespace IRaCIS.Application.Services
/// <summary>
/// New 查询条件 IsConfig 代表是字典类型配置项 否就是我们普通的项 和普通项的子项
/// New 查询条件
/// </summary>
/// <param name="basicDicQuery"></param>
/// <returns></returns>
@ -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<BasicDicView>(_mapper.ConfigurationProvider);

2
IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
View File

@ -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,

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

@ -33,8 +33,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<Dictionary, BasicDicView>()
.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<AddOrEditBasicDic, Dictionary>().ReverseMap();

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

@ -45,9 +45,6 @@ namespace IRaCIS.Core.Domain.Models
public bool IsEnable { get; set; }
public bool IsConfig { get; set; }
public Guid? ConfigTypeId { get; set; }