原先基础上添加排序功能

yanjinhui

2025-04-08 d0243cfc13545b2ee6145b4858c18701f4561508

原先基础上添加排序功能

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Telescopic/PaginationDTO.cs

@@ -39,6 +39,16 @@
        /// </summary>
        public int ? status {  get; set; }

        /// <summary>
        /// æŽ’序字段名
        /// </summary>
        public string ?sortField { get; set; }   

        /// <summary>
        /// æŽ’序方式："asc" æˆ– "desc"
        /// </summary>
        public string ?sortOrder { get; set; }   


    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/ILoginhsyService.cs

@@ -25,7 +25,7 @@
        /// é€€å‡ºæ—¶é—´
        /// </summary>
        /// <returns></returns>
        WebResponseContent OutLoginTime(int id);
        WebResponseContent OutLoginTime(string account);
        
       
    }

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Loginhsy.cs

@@ -34,12 +34,12 @@
        /// é€€å‡ºæ—¶é—´
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "退出时间")]
        public DateTime OutTiem { get; set; }
        public DateTime?OutTiem { get; set; }

        /// <summary>
        /// æ“ä½œå†…容
        /// </summary>
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "操作内容")]
        public string OpCenten {  get; set; }
        public string? OpCenten {  get; set; }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_UserController.cs

@@ -70,7 +70,8 @@
        [HttpPost, Route("login"), AllowAnonymous]
        public IActionResult Login([FromBody] LoginInfo loginInfo)
        {
            return Json(Service.Login(loginInfo));
            var result = Json(Service.Login(loginInfo));
            return result;
        }
        [HttpPost, Route("getCurrentUserInfo")]
        public WebResponseContent GetCurrentUser()

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/LoginhsyController.cs

@@ -35,9 +35,9 @@
        /// <param name="id"></param>
        /// <returns></returns>
        [HttpPost, Route("OutLoginTime"), AllowAnonymous]
        public WebResponseContent OutLoginTime(int id)
        public WebResponseContent OutLoginTime(string account)
        {
            return Service.OutLoginTime(id);
            return Service.OutLoginTime(account);
        }

    }

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceTeamController.cs

@@ -12,9 +12,9 @@
{
    [Route("api/[controller]")]
    [ApiController]
    public class MaintenanceTeamController : ApiBaseController<IMaintenanceService, Dt_MaintenanceTeam>
    public class MaintenanceTeamController : ApiBaseController<IMaintenanceTeamService, Dt_MaintenanceTeam>
    {
        public MaintenanceTeamController(IMaintenanceService service) : base(service)
        public MaintenanceTeamController(IMaintenanceTeamService service) : base(service)
        {


@@ -28,7 +28,7 @@
        [HttpPost, Route("MaintenanceSettingRecord"), AllowAnonymous]
        public WebResponseContent MaintenanceSettingRecord([FromBody] PaginationDTO pagination )
        {
            return Service.MaintenanceOperationRecord(pagination);
            return Service.MaintenanceSettingRecord(pagination);

        }
    }

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs

@@ -198,10 +198,13 @@
                        LoginTiem =DateTime.Now,
                        CreateDate = DateTime.Now
                    };
                   

                    // ä¿å­˜ç”¨æˆ·ç™»å½•ä¿¡æ¯
                    _cacheService.AddOrUpdate(user.UserId.ToString(), token);
                    _LoginhsyServer.AddData(loghis);
                     _LoginhsyServer.AddData(loghis);
                  // var id=   _LoginhsyServer.Db.Insertable(loghis).ExecuteReturnIdentity();
                   

                    // è¿”回响应
                    content = WebResponseContent.Instance.OK(data: new
@@ -210,7 +213,8 @@
                        userName = user.UserTrueName,
                        img = user.HeadImageUrl,
                        ID = user.UserId,
                        RoleId = user.RoleId
                        RoleId = user.RoleId,

                    });
                }
                else
@@ -220,7 +224,7 @@
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
                content = WebResponseContent.Instance.Error("登录异常: " + ex.ToString());
            }

            return content;
@@ -511,7 +515,7 @@


        /// <summary>
        /// æ›´æ–°ç”¨æˆ·
        ///百度云 æ›´æ–°ç”¨æˆ·
        /// </summary>
        /// <param name="addUserDTO"></param>
        /// <returns></returns>
@@ -519,8 +523,10 @@
        {
            try
            {

                // 1. æŸ¥è¯¢ç”¨æˆ·
                var sys = BaseDal.QueryData(x => x.User_Id == addUserDTO.id).FirstOrDefault();
                var user = BaseDal.QueryData();
                var sys = user.Where(x => x.User_Id == addUserDTO.id).FirstOrDefault();
                if (sys == null)
                {
                    return new WebResponseContent { Status = false, Message = "没找到该用户" };
@@ -560,7 +566,11 @@
                sys.Role_Id = addUserDTO.roleid;
                sys.RoleName = addUserDTO.rolename;
                sys.Enable = addUserDTO.enable;

                var list = user.Where(a => a.UserName == addUserDTO.username).FirstOrDefault();
                if (list != null)
                {
                    return new WebResponseContent { Status = false, Message = "账号重复，请重新录入" };
                }
                // 7. æ›´æ–°æ•°æ®åº“
                BaseDal.UpdateData(sys);

@@ -624,7 +634,7 @@
                return new WebResponseContent { Status = false, Message = "请上传文件" };

            // 1. ç¡®ä¿å­˜å‚¨ç›®å½•å­˜åœ¨
            string baseDirectory = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "UploadfaceImage");
            string baseDirectory = Path.Combine(Directory.GetCurrentDirectory(), "wwwroot", "image");
            if (!Directory.Exists(baseDirectory))
                Directory.CreateDirectory(baseDirectory);


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

@@ -4,6 +4,7 @@
using System.Text;
using System.Threading.Tasks;
using AutoMapper;
using SqlSugar;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
@@ -18,9 +19,9 @@
        public IRepository<Dt_Loginhsy> Repository => BaseDal;
        private readonly IRepository<Sys_User> _user;

        public LoginhsyService(IRepository<Dt_Loginhsy> BaseDal) : base(BaseDal)
        public LoginhsyService(IRepository<Sys_User> user, IRepository<Dt_Loginhsy> BaseDal) : base(BaseDal)
        {

            _user = user;
        }

        public WebResponseContent LoginRecord(PaginationDTO pagination)
@@ -32,21 +33,52 @@
                var sys = _user.Db.Queryable<Sys_User>();
                var main = Db.Queryable<Dt_Loginhsy>();

                //模糊查询
                var query = sys.InnerJoin<Dt_Loginhsy>((a, b) => a.UserName == b.UserName);
                if (!string.IsNullOrEmpty(pagination.searchKeyword))
                {
                    query = query.Where((a, b) =>
                        a.UserTrueName.Contains(pagination.searchKeyword) ||
                        a.Userteam.Contains(pagination.searchKeyword) ||
                        b.OpCenten.Contains(pagination.searchKeyword) 
                    );
                        b.OpCenten.Contains(pagination.searchKeyword));
                }
                
                //时间查询
                if (pagination.startDate.HasValue && pagination.endDate.HasValue)
                {
                    query = query.Where((a, b) => b.LoginTiem >= pagination.startDate.Value && b.LoginTiem <= pagination.endDate.Value);//登入时间
                    query = query.Where((a, b) => b.LoginTiem >= pagination.startDate.Value && b.LoginTiem <= pagination.endDate.Value);
                }
                var result=query
                .Select((a, b) => new

                // æŽ’序处理
                if (!string.IsNullOrEmpty(pagination.sortField))
                {
                    //isAsc：这是一个布尔值，判断排序是升序 (true)"asc" ,还是降序 (false) "desc"
                    var isAsc = pagination.sortOrder?.ToLower() == "asc";//pagination.sortOrder ä¸ä¸ºç©ºï¼Œåˆ™è°ƒç”¨ ToLower() æ–¹æ³•å°†å…¶è½¬ä¸ºå°å†™å­—母

                    query = pagination.sortField.ToLower() switch
                    {
                        //如果isAsc ä¸ºture就执行query.OrderBy((a, b) => b.LoginTiem, OrderByType.Asc)升序排序，
                        //如果为fales就执行query.OrderBy((a, b) => b.LoginTiem, OrderByType.Desc)降序排序
                        "logintiem" => isAsc ? query.OrderBy((a, b) => b.LoginTiem, OrderByType.Asc)
                                             : query.OrderBy((a, b) => b.LoginTiem, OrderByType.Desc),

                        "outtiem" => isAsc ? query.OrderBy((a, b) => b.OutTiem, OrderByType.Asc)
                                           : query.OrderBy((a, b) => b.OutTiem, OrderByType.Desc),

                        //"usertruename" => isAsc ? query.OrderBy((a, b) => a.UserTrueName, OrderByType.Asc)
                        //: query.OrderBy((a, b) => a.UserTrueName, OrderByType.Desc),
                        _ => query.OrderBy((a, b) => b.LoginTiem, OrderByType.Desc) // é»˜è®¤æŒ‰ç™»å…¥æ—¶é—´é™åº
                    };
                }
                else
                {
                    // é»˜è®¤æŒ‰ LoginTiem é™åº
                    query = query.OrderBy((a, b) => b.LoginTiem, OrderByType.Desc);
                }


                //返回结果
                var result = query.Select((a, b) => new
                {
                    a.User_Id,
                    a.UserTrueName,
@@ -56,32 +88,33 @@
                    b.OutTiem,
                    b.OpCenten,
                }).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);

                return new WebResponseContent
                {
                    Status = true,
                    Data = new
                    {
                        TotalCount = totalCount,//总数
                        PageIndex = pagination.pageIndex,//页数
                        PageSize = pagination.pageSize,//一页多少个数据
                        TotalCount = totalCount, // æ€»æ•°
                        PageIndex = pagination.pageIndex, // é¡µæ•°
                        PageSize = pagination.pageSize, // ä¸€é¡µå¤šå°‘个数据
                        Items = result
                    }
                };
            }
            catch (Exception ex)
            {

                return new WebResponseContent { Status = true, Message = "错误" + ex };
                return new WebResponseContent { Status = false, Message = "错误: " + ex.Message };
            }
        }

      

        public WebResponseContent OutLoginTime(int id)


        public WebResponseContent OutLoginTime(string account)
        {
            try
            {
                var log = BaseDal.QueryFirst(x => x.ID == id);
                var log = BaseDal.QueryData(x=>x.UserName== account).OrderByDescending(x=>x.UserName).FirstOrDefault();
                if (log==null)
                {
                    return new WebResponseContent { Status = false, Message = "失败" };

 ÏîÄ¿´úÂë/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,

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

@@ -1,4 +1,5 @@
using System;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -36,6 +37,8 @@
                var sys = _user.Db.Queryable<Sys_User>();
                var main = Db.Queryable<Dt_MaintenanceTeam>();


                //模糊查询
                var query = sys.InnerJoin<Dt_MaintenanceTeam>((a, b) => a.UserTrueName == b.OperatorName);
                if (!string .IsNullOrEmpty(pagination.searchKeyword))
                {
@@ -46,10 +49,36 @@
                       b.Modifier.Contains(pagination.searchKeyword)
                   );
                }
                //时间查询
                if (pagination.startDate.HasValue&&pagination.endDate.HasValue)
                {
                    query = query.Where((a, b) => b.DistributionTime >= pagination.startDate && b.DistributionTime <= pagination.endDate);
                }
                //排序
                if (!string.IsNullOrEmpty(pagination.sortField))
                {
                    var isAsc = pagination.sortOrder?.ToLower() == "asc";
                    query = pagination.sortField.ToLower() switch
                    {
                        //"OperatorName" => isAsc ? query.OrderBy((a, b) => b.OperatorName) : query.OrderByDescending((a, b) => b.OperatorName),

                        //"TeamName" => isAsc ? query.OrderBy((a, b) => b.TeamName) : query.OrderByDescending((a, b) => b.TeamName),

                        "distributiontime" => isAsc ? query.OrderBy((a, b) => b.DistributionTime) : query.OrderByDescending((a, b) => b.DistributionTime),

                        //"Modifier" => isAsc ? query.OrderBy((a, b) => b.Modifier) : query.OrderByDescending((a, b) => b.Modifier),

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

                }
                else
                {
                    //默认按创建时间降序排序
                    query = query.OrderByDescending((a, b) => b.Creater);
                }

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