From df8675e4c971714a8836e4ecb5c42986066dda9f Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 28 Apr 2022 15:04:43 +0800 Subject: [PATCH] xxx --- IRaCIS.Core.API/Controllers/InspectionController.cs | 1 - .../Service/Common/DTO/DictionaryModel.cs | 5 +++++ IRaCIS.Core.Application/Service/Common/_MapConfig.cs | 2 ++ IRaCIS.Core.Domain/Common/Dictionary.cs | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.API/Controllers/InspectionController.cs b/IRaCIS.Core.API/Controllers/InspectionController.cs index b2c0a9e43..b7e4df48a 100644 --- a/IRaCIS.Core.API/Controllers/InspectionController.cs +++ b/IRaCIS.Core.API/Controllers/InspectionController.cs @@ -100,7 +100,6 @@ namespace IRaCIS.Core.API.Controllers [UnitOfWork] public async Task AbandonTrial(DataInspectionDto opt) { - var cc = _userInfo.RequestUrl; var fun = await _trialConfigService.AbandonTrial(opt.OptCommand.trialId,opt.OptCommand.isAbandon); return await _inspectionService.Enforcement(opt.OptCommand, opt.AuditInfo, opt.SignInfo,null, fun); } diff --git a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs index 454bbddb0..745d0ec95 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs @@ -37,6 +37,8 @@ namespace IRaCIS.Application.Contracts public string ValueCN { get; set; } = String.Empty; + public int ChildCodeEnum { get; set; } + public int ShowOrder { get; set; } @@ -68,6 +70,9 @@ namespace IRaCIS.Application.Contracts public Guid? ParentId { get; set; } public string ParentCode { get; set; } = string.Empty; + + public int? ParentChildCodeEnum { get; set; } + } public class BasicDicQuery:PageInput diff --git a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs index b597eb064..145710b88 100644 --- a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs @@ -40,6 +40,8 @@ namespace IRaCIS.Core.Application.Service CreateMap() + .ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum)) + .ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code)); var token = ""; diff --git a/IRaCIS.Core.Domain/Common/Dictionary.cs b/IRaCIS.Core.Domain/Common/Dictionary.cs index a9a03f71f..4b6beb301 100644 --- a/IRaCIS.Core.Domain/Common/Dictionary.cs +++ b/IRaCIS.Core.Domain/Common/Dictionary.cs @@ -52,6 +52,7 @@ namespace IRaCIS.Core.Domain.Models [ForeignKey("ParentId")] public Dictionary Parent { get; set; } + public int ChildCodeEnum { get; set; } [StringLength(50)]