From 398a804b4174dd89bb491a07b38804cca30ac72f Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 29 Jun 2023 10:49:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E5=85=B8=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml               |  7 ++++
 .../Service/Common/DTO/DictionaryModel.cs     | 33 +++++++++++++++++++
 .../Service/Common/DictionaryService.cs       | 33 +++++++++++++++++++
 .../Service/Common/_MapConfig.cs              |  4 +++
 4 files changed, 77 insertions(+)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 9b20bf2e4..349f351ff 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -10936,6 +10936,13 @@
             <param name="addOrEditBasic"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Application.Services.DictionaryService.AddBasicDicAndChild(IRaCIS.Application.Contracts.AddBasicDicAndChild)">
+            <summary>
+            添加字典 的同时 一起添加子项  --New  
+            </summary>
+            <param name="addBasicDicAndChild"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.DictionaryService.GetBasicDicList(IRaCIS.Application.Contracts.BasicDicQuery)">
             <summary>
             New  查询条件  
diff --git a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
index 8604f20dd..0ff1c4cf8 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs
@@ -165,7 +165,40 @@ namespace IRaCIS.Application.Contracts
 
 
 
+    public class AddBasicDicAndChild
+    {
+        [NotDefault]
+        public Guid ConfigTypeId { get; set; }
 
+        public bool IsEnable { get; set; }
+
+        public string Code { get; set; } = String.Empty;
+
+        public int ShowOrder { get; set; }
+        public string Description { get; set; } = String.Empty;
+
+        public DicDataTypeEnum DataTypeEnum { get; set; }
+
+
+        public List<AddBasicDicChild> ChildList { get; set; } = new List<AddBasicDicChild>();
+    }
+
+
+    public class AddBasicDicChild
+    {
+        public string Code { 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 ShowOrder { get; set; }
+
+        public string Description { get; set; } = String.Empty;
+
+        public bool IsEnable { get; set; } = true;
+    }
 
 
 
diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
index f02173ae2..cc5bf300d 100644
--- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
+++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs
@@ -88,6 +88,39 @@ namespace IRaCIS.Application.Services
             return ResponseOutput.Ok(entity.Id.ToString());
         }
 
+
+        /// <summary>
+        /// 添加字典 的同时 一起添加子项  --New  
+        /// </summary>
+        /// <param name="addBasicDicAndChild"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput> AddBasicDicAndChild(AddBasicDicAndChild addBasicDicAndChild)
+        {
+            var verifyExp1 = new EntityVerifyExp<Dictionary>()
+            {
+                VerifyExp = t => t.Code == addBasicDicAndChild.Code && t.ParentId == null,
+                VerifyMsg = $"已有{addBasicDicAndChild.Code}名称的字典",
+                IsVerify = true
+            };
+
+
+            var entity = await _dicRepository.InsertFromDTOAsync(addBasicDicAndChild, false, verifyExp1);
+
+            var childList = _mapper.Map<List<Dictionary>>(addBasicDicAndChild.ChildList);
+
+            foreach (var item in childList)
+            {
+                item.DataTypeEnum = addBasicDicAndChild.DataTypeEnum;
+                item.ParentId = entity.Id;
+            }
+
+            await _dicRepository.AddRangeAsync(childList);
+
+            await _dicRepository.SaveChangesAsync();
+            return ResponseOutput.Ok(entity.Id.ToString());
+        }
+
         /// <summary>
         /// New  查询条件  
         /// </summary>
diff --git a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs
index 850a6d541..4077d674a 100644
--- a/IRaCIS.Core.Application/Service/Common/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Common/_MapConfig.cs
@@ -39,6 +39,10 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<AddOrEditBasicDic, Dictionary>().ReverseMap();
 
+
+            CreateMap<AddBasicDicAndChild, Dictionary>().ForMember(o => o.ChildList, t => t.Ignore());
+            CreateMap<AddBasicDicChild, Dictionary>();
+
             CreateMap<Dictionary, BasicDicSelectCopy>()
                  .ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum))
                  .ForMember(o => o.Value, t => t.MapFrom(u => u.MappedValue))