Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob

sunpengfei

2025-08-08 61aad62d817ddb6494f52a531fccb7e82bcfd13c

 FlexJobApi.Core/Utils/DbUtils/DbUtils.cs

@@ -148,12 +148,37 @@
            var q = rep.AsQueryable().AsNoTracking();
            if (query != null) q = query(q);
            else q = q.OrderBy(it => it.Sort).ThenBy(it => it.CreatedTime);
            q = q.OrderBy(page.OrderInput);
            q = q.CustomOrderBy(page.OrderInput);
            var s = selector == null
                ? q.ProjectToType<TItem>()
                : q.Select(selector);
            var pagedList = await s.ToPagedListAsync(page.Page, page.Rows, cancellationToken);
            var result = new PagedListQueryResult<TItem>();
            result.PageModel = page.Adapt<PagedListQueryResultPageModel>();
            result.PageModel.TotalCount = pagedList.TotalCount;
            result.PageModel.TotalPage = pagedList.TotalPages;
            result.Data = pagedList.Items.ToList();
            return result;
        }
        /// <summary>
        /// 查询分页列表数据
        /// </summary>
        /// <typeparam name="TResult"></typeparam>
        /// <typeparam name="TItem"></typeparam>
        /// <param name="page"></param>
        /// <param name="q"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        public static async Task<TResult> GetPagedListAsync<TResult, TItem>(
            this PagedListQueryPageModel page,
            IQueryable<TItem> q,
            CancellationToken cancellationToken = default)
            where TItem : class, new()
            where TResult : PagedListQueryResult<TItem>, new()
        {
            q = q.CustomOrderBy(page.OrderInput);
            var pagedList = await q.ToPagedListAsync(page.Page, page.Rows, cancellationToken);
            var result = new TResult();
            result.PageModel = page.Adapt<PagedListQueryResultPageModel>();
            result.PageModel.TotalCount = pagedList.TotalCount;
            result.PageModel.TotalPage = pagedList.TotalPages;
@@ -169,82 +194,60 @@
        /// <param name="q"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        public static async Task<PagedListQueryResult<TItem>> GetPagedListAsync<TItem>(
        public static Task<PagedListQueryResult<TItem>> GetPagedListAsync<TItem>(
            this PagedListQueryPageModel page,
            IQueryable<TItem> q,
            CancellationToken cancellationToken = default)
            where TItem : class, new()
        {
            q = q.OrderBy(page.OrderInput);
            var pagedList = await q.ToPagedListAsync(page.Page, page.Rows, cancellationToken);
            var result = new PagedListQueryResult<TItem>();
            result.PageModel = page.Adapt<PagedListQueryResultPageModel>();
            result.PageModel.TotalCount = pagedList.TotalCount;
            result.PageModel.TotalPage = pagedList.TotalPages;
            result.Data = pagedList.Items.ToList();
            return result;
            return GetPagedListAsync<PagedListQueryResult<TItem>, TItem>(page, q, cancellationToken);
        }

        /// <summary>
        /// 排序
        /// </summary>
        /// <typeparam name="T"></typeparam>
        /// <param name="q"></param>
        /// <param name="orders"></param>
        /// <returns></returns>
        public static IQueryable<T> OrderBy<T>(
            this IQueryable<T> q,
            List<PagedListQueryPageModelOrderInput> orders)
        public static IOrderedQueryable<T> CustomOrderBy<T>(this IQueryable<T> q, List<PagedListQueryPageModelOrderInput> orders)
        {
            if (orders.IsNull()) return q;

            var entityType = typeof(T);
            int index = 0;

            var props = entityType.GetProperties();
            foreach (var order in orders)
            ParameterExpression parameter = Expression.Parameter(typeof(T), "p");
            PagedListQueryPageModelOrderInput orderInput = orders[0];
            IOrderedQueryable<T> orderedQueryable = (orderInput.Order == EnumPagedListOrder.Asc)
                ? OrderBy(q, orderInput.Property, parameter)
                : OrderByDescending(q, orderInput.Property, parameter);
            for (int i = 1; i < orders.Count; i++)
            {
                if (string.IsNullOrEmpty(order.Property)) continue;

                // 获取排序字段的属性信息
                var propertyInfo = props.FirstOrDefault(it => it.Name.Equals(order.Property, StringComparison.OrdinalIgnoreCase));
                if (propertyInfo == null) throw Oops.Oh(EnumErrorCodeType.s404, $"该排序字段{order.Property}");

                // 创建表达式树
                var parameter = Expression.Parameter(entityType, "x");
                var propertyAccess = Expression.Property(parameter, propertyInfo);
                var lambda = Expression.Lambda(propertyAccess, parameter);

                string methodName;
                if (index == 0)
                {
                    // 首次排序
                    methodName = order.Order == EnumPagedListOrder.Asc
                        ? "OrderBy"
                        : "OrderByDescending";
                }
                else
                {
                    // 二次及以后排序
                    methodName = order.Order == EnumPagedListOrder.Asc
                        ? "ThenBy"
                        : "ThenByDescending";
                }

                // 调用相应的排序方法
                var resultExpression = Expression.Call(
                    typeof(Queryable),
                    methodName,
                    [entityType, propertyInfo.PropertyType],
                    q.Expression,
                    Expression.Quote(lambda)
                );

                q = q.Provider.CreateQuery<T>(resultExpression);
                index++;
                PagedListQueryPageModelOrderInput orderInput2 = orders[i];
                orderedQueryable = (orderInput2.Order == EnumPagedListOrder.Asc)
                    ? ThenBy(orderedQueryable, orderInput2.Property, parameter)
                    : ThenByDescending(orderedQueryable, orderInput2.Property, parameter);
            }

            return q;
            return orderedQueryable;
        }

        private static IOrderedQueryable<T> Ordering<T>(IQueryable<T> source, ParameterExpression parameter, string propertyName, string methodName)
        {
            Type typeFromHandle = typeof(T);
            MemberExpression memberExpression = Expression.PropertyOrField(parameter, propertyName);
            LambdaExpression expression = Expression.Lambda(memberExpression, parameter);
            MethodCallExpression expression2 = Expression.Call(typeof(Queryable), methodName, [typeFromHandle, memberExpression.Type], source.Expression, Expression.Quote(expression));
            return (IOrderedQueryable<T>)source.Provider.CreateQuery<T>(expression2);
        }

        public static IOrderedQueryable<T> OrderBy<T>(IQueryable<T> source, string propertyName, ParameterExpression parameter)
        {
            return Ordering(source, parameter, propertyName, "OrderBy");
        }

        public static IOrderedQueryable<T> OrderByDescending<T>(IQueryable<T> source, string propertyName, ParameterExpression parameter)
        {
            return Ordering(source, parameter, propertyName, "OrderByDescending");
        }

        public static IOrderedQueryable<T> ThenBy<T>(IOrderedQueryable<T> source, string propertyName, ParameterExpression parameter)
        {
            return Ordering(source, parameter, propertyName, "ThenBy");
        }

        public static IOrderedQueryable<T> ThenByDescending<T>(IOrderedQueryable<T> source, string propertyName, ParameterExpression parameter)
        {
            return Ordering(source, parameter, propertyName, "ThenByDescending");
        }

        /// <summary>
@@ -305,12 +308,14 @@
        /// <typeparam name="TEntity"></typeparam>
        /// <typeparam name="TRequest"></typeparam>
        /// <param name="request"></param>
        /// <param name="query"></param>
        /// <param name="checkExist"></param>
        /// <param name="update"></param>
        /// <param name="cancellationToken"></param>
        /// <returns></returns>
        public static async Task<Guid> SaveData<TEntity, TRequest>(
            this TRequest request,
            Func<IQueryable<TEntity>, IQueryable<TEntity>> query = null,
            Expression<Func<TEntity, bool>> checkExist = null,
            Action<TEntity> update = null,
            CancellationToken cancellationToken = default)
@@ -324,7 +329,9 @@
                throw Oops.Oh(EnumErrorCodeType.s405, $"该{summary ?? "信息"}");
            if (request.Id.HasValue)
            {
                var entity = await rep.AsQueryable().FirstOrDefaultAsync(it => it.Id == request.Id, cancellationToken);
                var q = rep.AsQueryable();
                if (query != null) q = query(q);
                var entity = await q.FirstOrDefaultAsync(it => it.Id == request.Id, cancellationToken);
                if (entity == null) throw Oops.Oh(EnumErrorCodeType.s404, $"该{summary ?? "信息"}");
                if (update != null) update(entity);
                else request.Adapt(entity);
@@ -451,10 +458,17 @@
                    }

                    // 赋值用户信息Id
                    prop = entity.Property(nameof(CommonEntity.CreatedUserInfoId));
                    prop = entity.Property(nameof(CommonEntity.CreatedUserId));
                    if (prop != null && prop.CurrentValue == null)
                    {
                        prop.CurrentValue = logier?.UserInfoId;
                        prop.CurrentValue = logier?.Id;
                    }

                    // 赋值企业Id
                    prop = entity.Property(nameof(CommonEntity.CreatedEnterpriseId));
                    if (prop != null && prop.CurrentValue == null)
                    {
                        prop.CurrentValue = logier?.EnterpriseId;
                    }

                    // 赋值跟踪Id
@@ -474,10 +488,10 @@
                    }

                    // 赋值用户信息Id
                    prop = entity.Property(nameof(CommonEntity.UpdatedUserInfoId));
                    prop = entity.Property(nameof(CommonEntity.UpdatedUserId));
                    if (prop != null)
                    {
                        prop.CurrentValue = logier?.UserInfoId;
                        prop.CurrentValue = logier?.Id;
                    }

                    // 赋值跟踪Id
@@ -523,7 +537,8 @@
                        : EnumDbAuditOperate.Deleted,
                    TraceId = App.GetTraceId(),
                    CreatedTime = DateTime.Now,
                    CreatedUserInfoId = logier?.UserInfoId,
                    CreatedUserId = logier?.Id,
                    CreatedEnterpriseId = logier?.EnterpriseId
                });
            }
        }