111

yanjinhui

2025-03-28 2d4e07b5d61490d3c3cfeb398d3d6e4b6f8be9bb

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

@@ -9,6 +9,12 @@
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
{
@@ -21,14 +27,19 @@
        {
            _user = user;
        }
<<<<<<< Updated upstream

        public WebResponseContent ShowMaintence()
=======
        public WebResponseContent ShowMaintence(PaginationDTO pagination)
>>>>>>> Stashed changes
        {
            try
            {
                var sys = _user.QueryData();
                var main = BaseDal.QueryData();

<<<<<<< Updated upstream
                var result = sys.Join(main,
                    u => u.UserName,
                    m => m.UserAccount,
@@ -42,6 +53,39 @@
                        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))
                {
                    query = query.Where((a, b) =>
                       a.UserTrueName.Contains(pagination.searchKeyword) ||
                         a.UserName.Contains(pagination.searchKeyword) ||
                        a.CardNumber.ToString().Contains(pagination.searchKeyword)||
                         a.Userteam.Contains(pagination.searchKeyword)
                    );
                }
                    var result= query .Select((a, b) => new
                            {
                               b.ID,
                               a.UserTrueName,
                               a.UserName,
                               a.CardNumber,
                               a.Userteam,
                               a.HeadImageUrl,
                               b.IsPossible
                           }).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
                return new WebResponseContent
                {
                    Status = true,
                    Data = new
                    {
                        TotalCount = totalCount,//总数
                        PageIndex = pagination.pageIndex,//页数
                        PageSize = pagination.pageSize,//一页多少个数据
                        Items = result
                    }
                };
>>>>>>> Stashed changes
            }
            catch (Exception ex)
            {
@@ -50,13 +94,28 @@
            }
        }

<<<<<<< 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();

<<<<<<< Updated upstream
                var result = sys.Join(main,
                    u => u.UserName,
                    m => m.UserAccount,
@@ -70,6 +129,48 @@
                        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 çš„数据

                // å¦‚果提供了搜索关键字，则进行模糊查询
                if (!string.IsNullOrEmpty(pagination.searchKeyword))
                {
                    query = query.Where((a, b) =>
                        a.UserTrueName.Contains(pagination.searchKeyword) ||   // æŒ‰çœŸå®žå§“名模糊搜索
                        a.Userteam.Contains(pagination.searchKeyword));        // æŒ‰ç”¨æˆ·ç­ç»„模糊搜索
                }

                // å¦‚果提供了 status å‚数，则按状态筛选
                if (pagination.status.HasValue)//等价if（status！=null）
                {
                    query = query.Where((a, b) => b.MaintenanceStatus == pagination.status.Value);
                }

                var result = query
                    .Select((a, b) => new
                    {
                        a.UserTrueName,
                        a.Userteam,
                        a.HeadImageUrl,
                        b.MaintenanceStatus,
                        b.MaintenanceDate,
                        b.IsPossible,
                    })
                    .ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount); // åˆ†é¡µ

                return new WebResponseContent
                {
                    Status = true,
                    Data = new
                    {
                        TotalCount = totalCount, // æ€»æ•°
                        PageIndex = pagination.pageIndex,   // å½“前页码
                        PageSize = pagination.pageSize,     // æ¯é¡µæ•°æ®é‡
                        Items = result
                    }
                };
>>>>>>> Stashed changes
            }
            catch (Exception ex)
            {
@@ -134,6 +235,69 @@
        }

        /// <summary>
<<<<<<< Updated upstream
=======
        /// æ£€ä¿®æ“ä½œè®°å½•
        /// </summary>
        /// <param name="pageIndex">页数</param>
        /// <param name="pageSize">一页多少个数据</param>
        /// <returns></returns>
        public WebResponseContent MaintenanceOperationRecord(PaginationDTO pagination)
        {
            try
            {
                int totalCount = 0;
                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) =>
                        a.UserTrueName.Contains(pagination.searchKeyword)||
                        a.Userteam.Contains(pagination.searchKeyword)||
                        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);
                }

                var result = query.Select((a, b) => new
                {
                    a.UserTrueName,
                    a.Userteam,
                    a.HeadImageUrl,
                    b.MaintenancStartTime,
                    b.MaintenancEendTime,
                }).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);

                return new WebResponseContent
                {
                    Status = true,
                    Data = new
                    {
                        TotalCount = totalCount,//总数
                        PageIndex = pagination.pageIndex,//页数
                        PageSize = pagination.pageSize,//一页多少个数据
                        Items = result
                    }
                };
            }
            catch (Exception ex)
            {

                return new WebResponseContent { Status = false, Message = "错误信息：" + ex.Message };
            }
        }

      

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