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/05-transfer/SysUnitTransfer.cs | 51 ++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 11 deletions(-)
diff --git a/Yw.BLL.Unit.Core/04-bll/05-transfer/SysUnitTransfer.cs b/Yw.BLL.Unit.Core/04-bll/05-transfer/SysUnitTransfer.cs
index 744fd32..69c671a 100644
--- a/Yw.BLL.Unit.Core/04-bll/05-transfer/SysUnitTransfer.cs
+++ b/Yw.BLL.Unit.Core/04-bll/05-transfer/SysUnitTransfer.cs
@@ -3,27 +3,56 @@
/// <summary>
/// 鍗曚綅杞崲
/// </summary>
- public partial class SysUnitTransfer : Yw.CAL.ISysUnitTransfer
+ public partial class SysUnitTransfer
{
private readonly Yw.CAL.ISysUnitTransfer _cal = CALCreateHelper.CreateCAL<Yw.CAL.ISysUnitTransfer>();
- public async Task<List<SysUnitTransferDto>> GetByTypeID(long TypeID)
+ /// <summary>
+ ///
+ /// </summary>
+ public virtual async Task<List<SysUnitTransferVmo>> GetByTypeID(long TypeID)
{
- return await _cal.GetByTypeID(TypeID);
- }
- public async Task<SysUnitTransferDto> GetByID(long ID)
- {
- return await _cal.GetByID(ID);
+ var dtoList = await _cal.GetByTypeID(TypeID);
+ return Dto2Vmos(dtoList);
}
- public async Task<List<SysUnitTransferDto>> GetByIds(List<long> Ids)
+ /// <summary>
+ ///
+ /// </summary>
+ public virtual async Task<SysUnitTransferVmo> GetByID(long ID)
{
- return await _cal.GetByIds(Ids);
+ var dto = await _cal.GetByID(ID);
+ return Dto2Vmo(dto);
}
- public async Task<bool> SetByTypeID(long TypeID, List<SysUnitTransferTypeSetter> Setters)
+ /// <summary>
+ ///
+ /// </summary>
+ public virtual async Task<List<SysUnitTransferVmo>> GetByIds(List<long> Ids)
{
- return await _cal.SetByTypeID(TypeID, Setters);
+ if (Ids == null || Ids.Count < 1)
+ {
+ return default;
+ }
+ var dtoList = await _cal.GetByIds(Ids);
+ return Dto2Vmos(dtoList);
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ public virtual async Task<bool> SetByTypeID(long TypeID, List<Yw.Vmo.SysUnitTransferTypeSetter> Setters)
+ {
+ var dtoList = Setters?.Select(x => new Yw.Dto.SysUnitTransferTypeSetter()
+ {
+ FromValueID = x.FromValueID,
+ ToValueID = x.ToValueID,
+ Expression = x.Expression
+ }).ToList();
+ var bol = await _cal.SetByTypeID(TypeID, dtoList);
+ return bol;
+ }
+
+
}
}
\ No newline at end of file
--
Gitblit v1.9.3