原先基础上添加排序功能

yanjinhui

2025-04-08 d0243cfc13545b2ee6145b4858c18701f4561508

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

@@ -4,17 +4,15 @@
using System.Text;
using System.Threading.Tasks;
using AutoMapper;
using SqlSugar;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_ITelescopicService;
using WIDESEAWCS_Model.Models;
<<<<<<< Updated upstream
=======
using WIDESEAWCS_DTO;
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using WIDESEAWCS_DTO.Telescopic;
>>>>>>> Stashed changes

namespace WIDESEAWCS_TelescopicService
{
@@ -27,33 +25,16 @@
        {
            _user = user;
        }
<<<<<<< Updated upstream

        public WebResponseContent ShowMaintence()
=======

        public WebResponseContent ShowMaintence(PaginationDTO pagination)
>>>>>>> Stashed changes
        {
            try
            {
                var sys = _user.QueryData();
                var main = BaseDal.QueryData();
                int totalCount = 0;
                var sys = _user.Db.Queryable<Sys_User>();
                var main = Db.Queryable<Dt_Maintenance>();

<<<<<<< Updated upstream
                var result = sys.Join(main,
                    u => u.UserName,
                    m => m.UserAccount,
                    (u, m) => new
                    {
                        u.UserTrueName,
                        u.UserName,
                        u.CardNumber,
                        u.RoleName,
                        u.HeadImageUrl,
                        m.IsPossible,
                    });
                return new WebResponseContent { Status = true, Data = result };
=======
                var query = sys.InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount);
                if (!string.IsNullOrEmpty(pagination.searchKeyword))
                {
@@ -85,51 +66,31 @@
                        Items = result
                    }
                };
>>>>>>> Stashed changes
            }
            catch (Exception ex)
            {

                return new WebResponseContent { Status = false, Data = ex };
                return new WebResponseContent { Status = false, Data = ex.Message };
            }
        }

<<<<<<< Updated upstream
        public WebResponseContent PersonnelMonitoring(bool ispossible)
=======



        /// <summary>
        /// æ¨¡ç³ŠæŸ¥è¯¢
        /// äººå‘˜ç›‘控
        /// </summary>
        /// <param name="pageIndex"></param>
        /// <param name="pageSize"></param>
        /// <param name="searchKeyword"></param>
        /// <returns></returns>
        public WebResponseContent PersonnelMonitoring(PaginationDTO pagination)
>>>>>>> Stashed changes
        {
            try
            {
                var sys = _user.QueryData();
                var main = BaseDal.QueryData();
                int totalCount = 0;
                var sys = _user.Db.Queryable<Sys_User>();
                var main = Db.Queryable<Dt_Maintenance>();

<<<<<<< Updated upstream
                var result = sys.Join(main,
                    u => u.UserName,
                    m => m.UserAccount,
                    (u, m) => new
                    {
                        u.UserTrueName,
                        u.RoleName,
                        u.HeadImageUrl,
                        m.MaintenanceStatus,
                        m.MaintenanceDate,
                        m.IsPossible,
                    }).Where(x=>x.IsPossible== ispossible);
                return new WebResponseContent { Status = true, Data = result };
=======
                var query = sys.InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount)
                               .Where((a, b) => b.IsPossible == "true"); // å…ˆç­›é€‰ IsPossible ä¸º true çš„数据

@@ -170,22 +131,34 @@
                        Items = result
                    }
                };
>>>>>>> Stashed changes
            }
            catch (Exception ex)
            {

                return new WebResponseContent { Status = false, Data = ex };
                return new WebResponseContent { Status = false, Data = ex.Message };
            }
        }

        public WebResponseContent RunOperation(int id)





        public WebResponseContent RunOperation(int id, string  ispossible)
        {
            try
            {
                var mon = BaseDal.QueryFirst(x => x.ID == id);
                mon.IsPossible = true;
                BaseDal.UpdateData(mon);
                if (ispossible == "true")
                {
                    mon.IsPossible = "true";
                    mon.MaintenanceDate = DateTime.Now;
                    BaseDal.UpdateData(mon);
                }
                else
                {
                    mon.IsPossible = "false";
                    BaseDal.UpdateData(mon);
                }
                return new WebResponseContent { Status = true, Data = mon };
            }
            catch (Exception ex)
@@ -195,6 +168,12 @@
            }
        }


        /// <summary>
        /// æ›´æ”¹çŠ¶æ€
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        public WebResponseContent ChangeTasState(int id)
        {
            try
@@ -235,8 +214,6 @@
        }

        /// <summary>
<<<<<<< Updated upstream
=======
        /// æ£€ä¿®æ“ä½œè®°å½•
        /// </summary>
        /// <param name="pageIndex">页数</param>
@@ -250,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) =>
@@ -260,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,
@@ -297,7 +295,6 @@
      

        /// <summary>
>>>>>>> Stashed changes
        /// çŠ¶æ€æžšä¸¾
        /// </summary>
        private enum Maint