解决冲突

qiuyao

2025-04-28 1dcc7b63a20daad7c7060f18878d8e8dbaad02de

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

@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Microsoft.AspNetCore.JsonPatch.Operations;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
@@ -16,43 +17,51 @@
        IRepository<Dt_Maintenance> Repository { get; }

       /// <summary>
       /// è®¾ç½®æ£€ä¿®æƒé™
       /// å±•ç¤ºè®¾ç½®æ£€ä¿®æƒé™
       /// </summary>
       /// <returns></returns>
<<<<<<< Updated upstream
        WebResponseContent ShowMaintence();
=======
        WebResponseContent ShowMaintence(PaginationDTO pagination);
>>>>>>> Stashed changes

        /// <summary>
        /// åœ¨æ£€ä¿®äººå‘˜ç›‘控
        /// å±•ç¤ºåœ¨æ£€ä¿®äººå‘˜ç›‘控
        /// </summary>
        /// <returns></returns>
<<<<<<< Updated upstream
        WebResponseContent PersonnelMonitoring(bool ispossible);
=======
        WebResponseContent PersonnelMonitoring(PaginationDTO pagination);
>>>>>>> Stashed changes

        /// <summary>
        /// æ›´æ”¹çŠ¶æ€ï¼Œè¿è¡Œè¿›å…¥æ£€ä¿®
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        WebResponseContent RunOperation(int id);
        WebResponseContent RunOperation(int id,string  ispossible);

        WebResponseContent ChangeTasState(int id);

<<<<<<< Updated upstream
=======
        /// <summary>
        /// æ£€ä¿®æ“ä½œè®°å½•
        /// </summary>
        /// <returns></returns>
        WebResponseContent MaintenanceOperationRecord(PaginationDTO pagination);

>>>>>>> Stashed changes

        //开始检修和结束检修（展示当前登入用户的检修任务）
        WebResponseContent MaintenanceTasksOfTheDay(string account);

        /// <summary>
        /// å¼€å§‹æ£€ä¿®
        /// </summary>
        /// <param name="id">用户id</param>
        /// <returns></returns>
        WebResponseContent StartMaintenceTask(string account);

        /// <summary>
        /// ç»“束检修
        /// </summary>
        /// <param name="id">用户id</param>
        /// <returns></returns>
        WebResponseContent StopMaintenanceTask(string account);


    }