原先基础上添加排序功能

yanjinhui

2025-04-08 d0243cfc13545b2ee6145b4858c18701f4561508

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs

@@ -25,6 +25,8 @@
        {
            _user = user;
        }


        public WebResponseContent ShowMaintence(PaginationDTO pagination)
        {
            try
@@ -75,7 +77,7 @@


        /// <summary>
        /// æ¨¡ç³ŠæŸ¥è¯¢
        /// äººå‘˜ç›‘控
        /// </summary>
        /// <param name="pageIndex"></param>
        /// <param name="pageSize"></param>
@@ -166,6 +168,12 @@
            }
        }


        /// <summary>
        /// æ›´æ”¹çŠ¶æ€
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        public WebResponseContent ChangeTasState(int id)
        {
            try
@@ -219,8 +227,8 @@
                var sys = _user.Db.Queryable<Sys_User>();
                var main = Db.Queryable<Dt_Maintenance>();

                //模糊查询
                var query = sys.InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount);

                if (!string.IsNullOrEmpty(pagination.searchKeyword))
                {
                    query = query.Where((a, b) =>
@@ -229,12 +237,33 @@
                        a.HeadImageUrl.Contains(pagination.searchKeyword)
                    );
                }

                //时间查询
                if (pagination.startDate.HasValue && pagination.endDate.HasValue)
                {
                    query = query.Where((a, b) => b.MaintenancStartTime >= pagination.startDate.Value && b.MaintenancStartTime <= pagination.endDate.Value);
                }
                //排序
                if (!string.IsNullOrEmpty(pagination.sortField))
                {
                    var isAcs = pagination.sortOrder?.ToLower() == "asc";
                    query = pagination.sortField.ToLower() switch
                    {
                       

                        "maintenancstarttime" => isAcs ? query.OrderBy((a, b) => b.MaintenancStartTime) : query.OrderByDescending((a, b) => b.MaintenancStartTime),

                        "maintenancenendtime" => isAcs ? query.OrderBy((a, b) => b.MaintenancEendTime) : query.OrderByDescending((a, b) => b.MaintenancEendTime),

                        _ => query.OrderByDescending((a, b) => b.Creater) // é»˜è®¤æŒ‰åˆ›å»ºæ—¶é—´é™åº
                    };

                }
                else
                {
                  query=query.OrderByDescending((a, b) => b.Creater);
                }

                //返回结果
                var result = query.Select((a, b) => new
                {
                    a.UserTrueName,