Merge branch 'master' into yyk

yyk

2024-07-18 bf1a9a818ffb721aea2709e9409fbb932b07e81d

 Wms/WMS.BLL/LogServer/OperationSOServer.cs

@@ -3,6 +3,7 @@
using System.Linq;
using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
using Model.ModelDto.LogDto;
using SqlSugar;
using WMS.BLL.SysServer;
@@ -21,43 +22,35 @@
        public OperationSOServer() : base(Db)
        {
        }
        public List<OperationDto> GetLogOperationSoList(string menuName, string type, string msg, string startTime, string endTime, int page, int limit, out int count)
        public async Task<List<OperationDto>> GetLogOperationSoList(string menuName, string type, string msg, string startTime, string endTime, int page, int limit, RefAsync<int> count)
        {
            try
            {
                var item = Expressionable.Create<LogOperationSO>()
            var item = Expressionable.Create<LogOperationSO>()
                    .AndIF(!string.IsNullOrWhiteSpace(menuName), it => it.MenuName.Contains(menuName.Trim()))
                    .AndIF(!string.IsNullOrWhiteSpace(type), it => it.Type == type)
                    .AndIF(!string.IsNullOrWhiteSpace(msg), it => it.Msg.Contains(msg.Trim()))
                    .AndIF(!string.IsNullOrWhiteSpace(startTime), it => it.CreateTime >= Convert.ToDateTime(startTime))
                    .AndIF(!string.IsNullOrWhiteSpace(endTime), it => it.CreateTime <= Convert.ToDateTime(endTime).AddDays(1))
                    .ToExpression();//注意 这一句 不能少
                var total = 0;
                var list = GetAllWhereAsync(item)
                    .LeftJoin<SysDictionary>((it, dic) => it.Type == dic.Id.ToString())
                    .LeftJoin<SysUserInfor>((it, dic, users) => it.CreateUser == users.Id)
                    .Select((it, dic, users) => new OperationDto()
                    {
                        Id = it.Id,
                        ParentNo = it.ParentNo,
                        MenuNo = it.MenuNo,
                        MenuName = it.MenuName,
                        FkNo = it.FkNo,
                        Type =  dic.DictName,
                        Msg = it.Msg,
                        CreateTime = it.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                        CreateUserName =  users.RealName,
                    })
                    .OrderByDescending(it => it.CreateTime)
                    .ToOffsetPage(page, limit, ref total);

                count = total;
                return list.OrderByDescending(m => m.CreateTime).ToList();
            }
            catch (Exception e)
            {
                throw new Exception(e.Message);
            }
            var list = await GetAllWhereAsync(item)
                .LeftJoin<SysDictionary>((it, dic) => it.Type == dic.Id.ToString())
                .LeftJoin<SysUserInfor>((it, dic, users) => it.CreateUser == users.Id)
                .Select((it, dic, users) => new OperationDto()
                {
                    Id = it.Id,
                    ParentNo = it.ParentNo,
                    MenuNo = it.MenuNo,
                    MenuName = it.MenuName,
                    FkNo = it.FkNo,
                    Type = dic.DictName,
                    Msg = it.Msg,
                    CreateTime = it.CreateTime.ToString("yyyy-MM-dd HH:mm:ss"),
                    CreateUserName = users.RealName,
                })
                .OrderByDescending(it => it.CreateTime)
                .ToPageListAsync(page, limit, count);

            return list.OrderByDescending(m => m.CreateTime).ToList();
        }
        public bool AddLogOperationSo(string parentNo, string menuName, string fkNo, string type, string msg, int userId)
        {