修改冲突后问题

duheng

2024-11-29 9c1af7f5ec91917b4276b25406c86386fd337fbb

 BLL/PBS.BLL.WE.Core/03-localclient/01-utensil/UtensilMapping.cs

@@ -1,12 +1,15 @@
namespace PBS.CAL.WE.LocalClient
using Mapster;
using PBS.CAL.WE;
using Yw.Dto;

namespace PBS.CAL.WE.LocalClient
{
    /// <summary>
    /// 用水器具映射
    ///</summary>    
    public class UtensilMapping : IUtensilMapping
    { 
        
        private readonly Service.WE.UtensilMapping _service = new();
        private readonly PBS.Service.WE.UtensilMapping _service = new();
   
        #region Query

@@ -36,6 +39,20 @@
        }

        /// <summary>
        /// 通过 ItemID 获取
        /// </summary>
        public async Task<List<UtensilMappingDto>> GetByItemID(long ItemID)
        {
            return await Task.Factory.StartNew(() =>
            {
                var list = _service.GetAll();
                var select = list.Where(x => x.ItemID == ItemID).ToList();
                return select?.Select(x => new UtensilMappingDto(x)).ToList();
            }
            );
        }

        /// <summary>
        /// 通过 Ids 获取
        /// </summary>
        public async Task<List<UtensilMappingDto>> GetByIds(List<long> Ids)
@@ -47,7 +64,6 @@
                return vm_list;
            });
        }

 
        /// <summary>
        /// 获取最大排序码
@@ -61,7 +77,7 @@
            });
        }
     
        #endregion 
        #endregion Query

        #region Insert

@@ -72,7 +88,7 @@
        {
            return await Task.Factory.StartNew(() =>
            {
                var model = input.Adapt<AddUtensilMappingInput, Model.WE.UtensilMapping>();
                var model = input.Adapt<AddUtensilMappingInput, PBS.Model.WE.UtensilMapping>();
                model.SortCode = _service.GetMaxSortCode() + 1;            
                var id = _service.Insert(model);
                return id;
@@ -86,7 +102,10 @@
        {
            return await Task.Factory.StartNew(() =>
            {
                return false;
                var list = inputList.Select(x => x.Adapt<AddUtensilMappingInput, PBS.Model.WE.UtensilMapping>()).ToList();
                list.ForEach(x => x.SortCode = _service.GetMaxSortCode() + 1);
                var id = _service.Inserts(list);
                return id;
            });
        }
  
@@ -117,7 +136,7 @@
                {
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D001, $"ID:{input.ID} 数据不存在");
                }
                var rhs = new Model.WE.UtensilMapping(model);
                var rhs = new PBS.Model.WE.UtensilMapping(model);
                input.Adapt(rhs);
                var bol = _service.Update(rhs);
                return bol;
@@ -145,7 +164,6 @@
                return false;
            });
        }
        
 
        /// <summary>
        /// 更新排序码
@@ -199,7 +217,12 @@
        {
            return await Task.Factory.StartNew(() =>
            {
                return false;
                var bol = _service.DeleteByIds(Ids, out string msg);
                if (!bol)
                {
                    throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.D999, msg);
                }
                return true;
            });
        }

@@ -214,6 +237,16 @@
            });
        } 
        
        #endregion 
        /// <summary>
        /// 通过  ItemID 删除所有
        /// </summary>
        public virtual async Task<bool> DeleteAllByItemID(long item)
        {
            var alllist = await GetByItemID(item);
            var bol = await DeleteByIds(alllist.Select(x => x.ID).ToList());
            return bol;
        }

        #endregion Delete
    }
}