From abf3ceabdd98abd0d955b03732e581a43c4e9fb0 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 13 一月 2025 15:01:31 +0800
Subject: [PATCH] 解决冲突

---
 Yw.BLL.Unit.Core/04-bll/01-lang/SysUnitLang.cs |  119 +++++++++++++++++++++++++++++++++++++++--------------------
 1 files changed, 79 insertions(+), 40 deletions(-)

diff --git a/Yw.BLL.Unit.Core/04-bll/01-lang/SysUnitLang.cs b/Yw.BLL.Unit.Core/04-bll/01-lang/SysUnitLang.cs
index aaf202f..310c1c3 100644
--- a/Yw.BLL.Unit.Core/04-bll/01-lang/SysUnitLang.cs
+++ b/Yw.BLL.Unit.Core/04-bll/01-lang/SysUnitLang.cs
@@ -3,95 +3,134 @@
     /// <summary>
     /// 鍗曚綅璇█
     /// </summary>
-    public partial class SysUnitLang : Yw.CAL.ISysUnitLang
+    public partial class SysUnitLang
     {
         private readonly Yw.CAL.ISysUnitLang _cal = CALCreateHelper.CreateCAL<Yw.CAL.ISysUnitLang>();
 
         #region Query銆�
-        public async Task<List<SysUnitLangDto>> GetAll()
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual async Task<List<SysUnitLangVmo>> GetAll()
         {
-            return await _cal.GetAll();
+            var dtoList = await _cal.GetAll();
+            return Dto2Vmos(dtoList);
         }
 
-        public async Task<SysUnitLangDto> GetByID(long ID)
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual async Task<SysUnitLangVmo> GetByID(long ID)
         {
-            return await _cal.GetByID(ID);
+            var dto = await _cal.GetByID(ID);
+            return Dto2Vmo(dto);
         }
 
-        public async Task<List<SysUnitLangDto>> GetByIds(List<long> Ids)
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual async Task<List<SysUnitLangVmo>> GetByIds(List<long> Ids)
         {
-            return await _cal.GetByIds(Ids);
+            if (Ids == null || Ids.Count < 1)
+            {
+                return default;
+            }
+            var dtoList = await _cal.GetByIds(Ids);
+            return Dto2Vmos(dtoList);
         }
 
         #endregion
 
         #region Insert
 
-        public async Task<long> Insert(AddSysUnitLangInput model)
+        /// <summary>
+        /// 鎻掑叆涓�鏉�
+        /// </summary>
+        public virtual async Task<long> Insert(SysUnitLangVmo vmo)
         {
-            return await _cal.Insert(model);
+            var dto = Vmo2AddDto(vmo);
+            var id = await _cal.Insert(dto);
+            return id;
         }
 
-        public async Task<bool> Inserts(List<AddSysUnitLangInput> list)
+        /// <summary>
+        /// 鎻掑叆澶氭潯
+        /// </summary>
+        public virtual async Task<bool> Inserts(List<SysUnitLangVmo> vmoList)
         {
-            return await _cal.Inserts(list);
-        }
-
-        public async Task<bool> BulkInserts(List<AddSysUnitLangInput> list)
-        {
-            return await _cal.BulkInserts(list);
+            var dtoList = Vmo2AddDtos(vmoList);
+            var bol = await _cal.Inserts(dtoList);
+            return bol;
         }
 
         #endregion
 
         #region Update
 
-        public async Task<bool> Update(UpdateSysUnitLangInput model)
+        /// <summary>
+        /// 鏇存柊
+        /// </summary>
+        public virtual async Task<bool> Update(SysUnitLangVmo vmo)
         {
-            return await _cal.Update(model);
+            var dto = Vmo2UpdateDto(vmo);
+            var bol = await _cal.Update(dto);
+            return bol;
         }
 
-        public async Task<bool> Updates(List<UpdateSysUnitLangInput> list)
+        /// <summary>
+        /// 鎵归噺鏇存柊
+        /// </summary>
+        public virtual async Task<bool> Updates(List<SysUnitLangVmo> vmoList)
         {
-            return await _cal.Updates(list);
+            var dtoList = Vmo2UpdateDtos(vmoList);
+            var bol = await _cal.Updates(dtoList);
+            return bol;
         }
 
-        public async Task<bool> BulkUpdates(List<UpdateSysUnitLangInput> list)
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual async Task<bool> UpdateCode(long ID, string Code)
         {
-            return await _cal.BulkUpdates(list);
+            var bol = await _cal.UpdateCode(ID, Code);
+            return bol;
         }
 
-        public async Task<bool> UpdateCode(long ID, string Code)
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual async Task<bool> UpdateSortCode(long ID, int SortCode)
         {
-            return await _cal.UpdateCode(ID, Code);
+            var bol = await _cal.UpdateSortCode(ID, SortCode);
+            return bol;
         }
 
-        public async Task<bool> UpdateSortCode(long ID, int SortCode)
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual async Task<bool> UpdateSorter(List<Yw.Vmo.Sorter> Sorters)
         {
-            return await _cal.UpdateSortCode(ID, SortCode);
-        }
-
-        public async Task<bool> UpdateSorter(List<UpdateSortCodeInput> Sorters)
-        {
-            return await _cal.UpdateSorter(Sorters);
+            var dtoList = Sorters.ToDtoList();
+            var bol = await _cal.UpdateSorter(dtoList);
+            return bol;
         }
 
         #endregion
 
         #region Delete銆�
-        public async Task<bool> DeleteByID(long ID)
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public virtual async Task<bool> DeleteByID(long ID)
         {
             return await _cal.DeleteByID(ID);
         }
-        public async Task<bool> DeleteByIds(List<long> Ids)
-        {
-            return await _cal.DeleteByIds(Ids);
-        }
 
-        public async Task<bool> DeleteAll()
-        {
-            return await _cal.DeleteAll();
-        }
+
         #endregion
+
+
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3