111

yanjinhui

2025-03-28 9f0add00d40fc00e039b92b2fb3469394b1a24f5

 ÏîÄ¿´úÂë/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,14 @@
        {
            _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,18 +64,13 @@
                        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)
=======



@@ -108,28 +82,13 @@
        /// <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 +129,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)
@@ -235,8 +206,6 @@
        }

        /// <summary>
<<<<<<< Updated upstream
=======
        /// æ£€ä¿®æ“ä½œè®°å½•
        /// </summary>
        /// <param name="pageIndex">页数</param>
@@ -297,7 +266,6 @@
      

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