From 4b4cc0dd66d0bfb8220709f6a5edd5fc3b8a65c2 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期一, 02 六月 2025 13:58:47 +0800
Subject: [PATCH] 按需修改美心接口
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
index 4619a7b..9422a06 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
@@ -116,7 +116,7 @@
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="searchKeyword"></param>
- /// <returns></returns>
+ /// <returns></returns>(杩欎釜娌℃湁鐢ㄥ埌浜�)
public WebResponseContent PersonnelMonitoring(PaginationDTO pagination)
{
try
@@ -353,23 +353,7 @@
query=query.OrderByDescending((a, b) => b.Creater);
}
- // 濡傛灉涓嶆槸绠＄悊鍛橈紝鏍规嵁閮ㄩ棬杩囨护
- if (pagination.account != "admin")
- {
- var currentUser = _user.Db.Queryable<Sys_User>()
- .Where(u => u.UserName == pagination.account)
- .First();
-
- if (currentUser == null)
- {
- return new WebResponseContent { Status = false, Data = "鏈幏鍙栧埌鐢ㄦ埛淇℃伅" };
- }
-
- int? deptId = currentUser.Dept_Id;
-
- query = query.Where((a, b) => a.Dept_Id == deptId);
- }
-
+
//杩斿洖缁撴灉
var result = query.Select((a, b) => new
{
@@ -675,14 +659,13 @@
maint.MaintenanceStatus = 0;//鏇存敼鐘舵��
BaseDal.UpdateData(maint);
////鎻掑叆璁板綍琛�
- //var recording = new Dt_MaintenanceTeam //娣诲姞璁板綍
- //{
- // OperatorName = sysuer.UserTrueName,
- // TeamName = sysuer.RoleName,
- // DistributionTime = DateTime.Now,
- // EndTime=DateTime.Now,
- //};
- //_team.AddData(recording);
+ var recording = new Dt_MaintenanceTeam //娣诲姞璁板綍
+ {
+ OperatorName = sysuer.UserTrueName,
+ TeamName = sysuer.RoleName,
+ EndTime = DateTime.Now,
+ };
+ _team.AddData(recording);
return new WebResponseContent { Status = true, Data = maint, Message = "瀹屾垚妫�淇�" };
}
@@ -692,6 +675,29 @@
}
}
+
+ /// <summary>
+ /// 灞曠ず寮�濮嬫淇汉鍛�
+ /// </summary>
+ /// <returns></returns>
+ public WebResponseContent YShowStartTake()
+ {
+ try
+ {
+ var reslut=BaseDal.QueryData(x => x.MaintenanceStatus == 1).ToList();
+ if (reslut.Count<=0)
+ {
+ return new WebResponseContent { Status = false, Message = "杩樻病鏈変汉寮�濮嬫淇�" };
+ }
+ return new WebResponseContent { Status = true, Data = reslut,Message="妫�淇汉鍛樻湁浠ヤ笅" };
+ }
+ catch (Exception ex)
+ {
+
+ return new WebResponseContent { Status = false, Message = ex.Message };
+ }
+ }
+
/// <summary>
/// 鐘舵�佹灇涓�
/// </summary>
--
Gitblit v1.9.3