qiuyao
2025-04-28 bb7f59a301a390e04443fa4745bd2afa1fa58e0f
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs
@@ -1,8 +1,10 @@
using System;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_DTO.Telescopic;
@@ -13,15 +15,14 @@
    public class MaintenanceTeamService : ServiceBase<Dt_MaintenanceTeam, IRepository<Dt_MaintenanceTeam>>, IMaintenanceTeamService
    {
        public IRepository<Dt_MaintenanceTeam> Repository => BaseDal;
        private readonly IRepository<Sys_User> _user;
        public MaintenanceTeamService(IRepository<Dt_MaintenanceTeam> BaseDal) : base(BaseDal)
        public MaintenanceTeamService(IRepository<Dt_MaintenanceTeam> BaseDal,IRepository<Sys_User> user) : base(BaseDal)
        {
            _user = user;
        }
<<<<<<< Updated upstream
=======
        /// <summary>
        /// æ£€ä¿®è®¾ç½®è®°å½•
        /// </summary>
@@ -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
                {
@@ -81,6 +110,5 @@
        }
>>>>>>> Stashed changes
    }
}