解决冲突

lixiaojun

2025-01-13 abf3ceabdd98abd0d955b03732e581a43c4e9fb0

 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 Task<List<SysUnitTransferDto>> GetByTypeID(long TypeID)
        /// <summary>
        /// 
        /// </summary>
        public virtual async Task<List<SysUnitTransferVmo>> GetByTypeID(long TypeID)
        {
            return _cal.GetByTypeID(TypeID);
        }
        public Task<SysUnitTransferDto> GetByID(long ID)
        {
            return _cal.GetByID(ID);
            var dtoList = await _cal.GetByTypeID(TypeID);
            return Dto2Vmos(dtoList);
        }

        public Task<List<SysUnitTransferDto>> GetByIds(List<long> Ids)
        /// <summary>
        /// 
        /// </summary>
        public virtual async Task<SysUnitTransferVmo> GetByID(long ID)
        {
            return _cal.GetByIds(Ids);
            var dto = await _cal.GetByID(ID);
            return Dto2Vmo(dto);
        }

        public Task<bool> SetByTypeID(long TypeID, List<SysUnitTransferTypeSetter> Setters)
        /// <summary>
        /// 
        /// </summary>
        public virtual async Task<List<SysUnitTransferVmo>> GetByIds(List<long> Ids)
        {
            return _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;
        }


    }
}