From f1a841f056fe4d7be16f39d6fe169667f743d00a Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期二, 27 五月 2025 17:29:56 +0800
Subject: [PATCH] 重新修改/开始检修/结束检修/检修记录等接口
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs | 242 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 199 insertions(+), 43 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
index bd1cb30..2c2b8d6 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
@@ -42,7 +42,7 @@
try
{
int totalCount = 0;
- var sys = _user.Db.Queryable<Sys_User>();
+ var sys = _user.Db.Queryable<Sys_User>().Where(x=>x.Enable==1);
var main = Db.Queryable<Dt_Maintenance>();
var query = sys.InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount);
@@ -74,7 +74,6 @@
query = query.Where((a, b) => a.Dept_Id == deptId);
}
-
// 鎵ц鍒嗛〉鏌ヨ
var result = query.Select((a, b) => new
{
@@ -123,14 +122,15 @@
// 绗竴姝ワ細鑷姩娓呯悊杩囨湡妫�淇姸鎬�
var today = DateTime.Today;
var recordsToUpdate = Db.Queryable<Dt_Maintenance>()
- .Where(b => b.MaintenancStartTime != null &&
- b.MaintenancStartTime.Value.Date < today )
+ .Where(b => b.MaintenanceDate != null &&
+ b.MaintenanceDate.Value.Date < today )
.ToList();
if (recordsToUpdate.Count > 0)
{
foreach (var record in recordsToUpdate)//鏇存柊
{
+ record.MaintenanceDate = null;//娓呯┖妫�淇棩鏈�
record.MaintenancStartTime = null;//娓呯┖寮�濮嬫椂闂�
record.MaintenancEendTime = null;//娓呯┖缁撴潫鏃堕棿
record.MaintenanceStatus = 0; // Set to false
@@ -211,7 +211,7 @@
/// <summary>
- /// 鏇存柊鐘舵�佹槸鍚﹀厑璁歌繘鍏ユ淇�
+ /// 鏇存柊鐘舵�佹槸鍚﹀厑璁歌繘鍏ユ淇紙娣诲姞浜嗘淇褰曪級
/// </summary>
/// <param name="id"></param>
/// <param name="ispossible"></param>
@@ -231,7 +231,7 @@
mon.IsPossible = "true";
mon.MaintenanceDate = DateTime.Now;
BaseDal.UpdateData(mon);
- var recording = new Dt_MaintenanceTeam
+ var recording = new Dt_MaintenanceTeam //娣诲姞璁板綍
{
OperatorName = sysuer.UserTrueName,
TeamName = sysuer.RoleName,
@@ -258,7 +258,7 @@
/// <summary>
- /// 鏇存敼鐘舵��
+ /// 鏇存敼鐘舵�侊紙鏆傛椂娌℃湁鐢ㄥ埌锛�
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
@@ -374,6 +374,7 @@
a.UserTrueName,
a.Userteam,
a.HeadImageUrl,
+ a.Dept_Id,
b.MaintenancStartTime,
b.MaintenancEendTime,
}).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
@@ -399,7 +400,7 @@
/// <summary>
- /// 鐪嬩粖澶╃殑妫�淇换鍔�
+ /// 鏌ョ湅浠婂ぉ鐨勬淇换鍔★紙杩愯妫�淇殣钘忎簡锛岃繖涓帴鍙ｄ篃鐢ㄤ笉閬擄級
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
@@ -426,52 +427,186 @@
b.MaintenancStartTime,
b.MaintenancEendTime,
}).ToList();
- if (query==null)
+ if (query == null)
{
return new WebResponseContent { Status = false, Message = "浣犱粖澶╂病鏈夋淇换鍔�" };
}
-
- return new WebResponseContent { Status=true, Data = query };
+
+ return new WebResponseContent { Status = true, Data = query };
}
catch (Exception ex)
{
return new WebResponseContent { Status = false, Message = "閿欒淇℃伅锛�" + ex.Message };
}
-
+
}
+
+ /// <summary>
+ /// 鐪嬩粖澶╃殑妫�淇换鍔★紙杩愯妫�淇殣钘忎簡锛岃繖涓帴鍙ｄ篃鐢ㄤ笉閬擄級
+ /// </summary>
+ /// <param name="id"></param>
+ /// <returns></returns>
+ //public WebResponseContent MaintenanceTasksOfTheDay(string account)
+ //{
+ // try
+ // {
+
+ // var query = _user.Db.Queryable<Sys_User>()
+ // .InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount)
+ // .Where((a,b) => b.UserAccount == account ).Select((a, b) => new
+ // {
+ // b.ID,
+ // a.UserTrueName,
+ // a.UserName,
+ // a.CardNumber,
+ // a.Userteam,
+ // a.HeadImageUrl,
+ // b.IsPossible,
+ // b.MaintenanceStatus,
+ // b.MaintenanceDate,
+ // b.MaintenancStartTime,
+ // b.MaintenancEendTime,
+ // }).ToList();
+ // if (query == null)
+ // {
+ // return new WebResponseContent { Status = false, Message = "浣犱粖澶╂病鏈夋淇换鍔�" };
+ // }
+
+
+
+ // return new WebResponseContent { Status = true, Data = query };
+ // }
+ // catch (Exception ex)
+ // {
+
+ // return new WebResponseContent { Status = false, Message = "閿欒淇℃伅锛�" + ex.Message };
+ // }
+
+ //}
+
+ ///// <summary>
+ ///// 寮�濮嬫淇�
+ ///// </summary>
+ ///// <param name="account"></param>
+ ///// <returns></returns>(鐝暱-鏅�氬憳宸�)
+ //public WebResponseContent StartMaintenceTask(string account)
+ //{
+ // try
+ // {
+ // var today = DateTime.Today; // 浠婂ぉ鐨勯浂鐐�
+ // var tomorrow = today.AddDays(1); // 鏄庡ぉ鐨勯浂鐐�
+
+
+ // var maint = BaseDal.QueryData(x =>
+ // x.UserAccount == account &&
+ // x.IsPossible == "true" &&
+ // x.MaintenanceDate >= today &&
+ // x.MaintenanceDate < tomorrow
+ // ).FirstOrDefault();
+
+ // if (maint == null)
+ // {
+ // return new WebResponseContent { Status = false, Message = "鏈壘鍒颁粖鏃ョ殑缁存姢浠诲姟璁板綍" };
+ // }
+
+ // maint.MaintenancStartTime = DateTime.Now;
+ // BaseDal.UpdateData(maint);
+
+ // return new WebResponseContent { Status = true, Data = maint };
+ // }
+ // catch (Exception ex)
+ // {
+ // return new WebResponseContent { Status = false, Message = "閿欒淇℃伅锛�" + ex.Message };
+ // }
+ //}
+
+
+ ///// <summary>
+ ///// 缁撴潫妫�淇�
+ ///// </summary>
+ ///// <param name="account"></param>
+ ///// <returns></returns>
+ //public WebResponseContent StopMaintenanceTask(string account)
+ //{
+ // try
+ // {
+ // var today = DateTime.Today; // 浠婂ぉ鐨勯浂鐐�
+ // var tomorrow = today.AddDays(1); // 鏄庡ぉ鐨勯浂鐐�
+
+ // var maint = BaseDal.QueryData(x => x.UserAccount == account && x.IsPossible == "true"
+ // && x.MaintenanceDate >= today &&x.MaintenanceDate < tomorrow).FirstOrDefault();
+ // if (maint == null)
+ // {
+ // return new WebResponseContent { Status = false, Message = "鏈壘鍒板彲鐢ㄧ殑缁存姢浠诲姟璁板綍" };
+ // }
+ // // 淇敼鍏剁粨鏉熸椂闂�
+ // maint.MaintenancEendTime = DateTime.Now;
+ // maint.IsPossible = "ok";//ok灏变唬琛ㄥ畬鎴愪簡
+ // BaseDal.UpdateData(maint);
+ // return new WebResponseContent { Status = true, Data = maint };
+
+ // }
+ // catch (Exception ex)
+ // {
+
+ // return new WebResponseContent { Status = false, Message = "閿欒淇℃伅锛�" + ex.Message };
+ // }
+ //}
+
+
/// <summary>
/// 寮�濮嬫淇�
/// </summary>
- /// <param name="account"></param>
+ /// <param name="account">璐﹀彿</param>
+ /// <param name="LocalIP">閭ｅ彴鐢佃剳鐧诲叆鐨刬p鍦板潃</param>
/// <returns></returns>
- public WebResponseContent StartMaintenceTask(string account)
+ public WebResponseContent StartMaintenceTask(string account,string LocalIP)
{
try
{
- var today = DateTime.Today; // 浠婂ぉ鐨勯浂鐐�
- var tomorrow = today.AddDays(1); // 鏄庡ぉ鐨勯浂鐐�
-
-
- var maint = BaseDal.QueryData(x =>
- x.UserAccount == account &&
- x.IsPossible == "true" &&
- x.MaintenanceDate >= today &&
- x.MaintenanceDate < tomorrow
- ).FirstOrDefault();
-
- if (maint == null)
+ var user = BaseDal.QueryData();
+ var maint = user.Where(x =>x.UserAccount == account).FirstOrDefault();
+ var sysuer = _user.QueryData(x => x.UserName == account).FirstOrDefault();//鐢ㄦ埛琛�
+ if (maint == null || sysuer == null)
{
- return new WebResponseContent { Status = false, Message = "鏈壘鍒颁粖鏃ョ殑缁存姢浠诲姟璁板綍" };
+ return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌璇ョ敤鎴�" };
}
+ if (maint.IsLeader!=1)//濡傛灉璇ョ敤鎴蜂笉鏄彮闀匡紝閭ｄ箞瑕佺瓑鐝暱鍏堝仛锛屼粬鎵嶅彲浠ュ仛
+ {
+ //鍏堟煡鎵剧敤鎴风殑鐝暱鏄笉鏄仛浜�
+ //bool monitor = user.Where(x => x.Roleid == maint.Roleid && x.IsLeader == 1 && x.MaintenanceStatus == 1);
+ //if (monitor==null)
+ //{
+ // return new WebResponseContent { Status = false, Message = "浣犵殑涓婄骇杩樻病鏈夊紑濮嬫淇紝璇风◢鍚庡啀璇�" };
+ //}
+ bool leaderStarted = user.Any(x =>x.Roleid == maint.Roleid &&x.IsLeader == 1 &&x.MaintenanceStatus == 1); //娌℃壘鍒拌偗瀹氭槸false
+ if (!leaderStarted)
+ {
+ return new WebResponseContent { Status = false, Message = "璇风瓑寰呯粍闀垮紑濮嬫淇�" };
+ }
- maint.MaintenancStartTime = DateTime.Now;
+ }
+ //濡傛灉婊¤冻涓嬮潰鐨勬潯浠跺氨寮�濮�
+ maint.MaintenancStartTime = DateTime.Now;//璁板綍寮�濮嬫椂闂�
+ maint.MaintenanceStatus = 1;//鏇存敼鐘舵��
BaseDal.UpdateData(maint);
+ //鎻掑叆璁板綍琛�
+ var recording = new Dt_MaintenanceTeam //娣诲姞璁板綍
+ {
+ OperatorName = sysuer.UserTrueName,
+ TeamName = sysuer.RoleName,
+ DistributionTime = DateTime.Now,
+ IPAddress= LocalIP,
+ //Creater = "admin",
+ //CreateDate = DateTime.Now,
+ };
+ _team.AddData(recording);
- return new WebResponseContent { Status = true, Data = maint };
+ return new WebResponseContent { Status = true, Data = maint,Message="寮�濮嬫淇�" };
}
catch (Exception ex)
{
@@ -482,36 +617,57 @@
/// <summary>
/// 缁撴潫妫�淇�
- /// </summary>
+ /// </summary>MaintenanceStatus 0浠ｈ〃妫�淇畬鎴� 1浠ｈ〃妫�淇腑
/// <param name="account"></param>
/// <returns></returns>
public WebResponseContent StopMaintenanceTask(string account)
{
try
{
- var today = DateTime.Today; // 浠婂ぉ鐨勯浂鐐�
- var tomorrow = today.AddDays(1); // 鏄庡ぉ鐨勯浂鐐�
-
- var maint = BaseDal.QueryData(x => x.UserAccount == account && x.IsPossible == "true"
- && x.MaintenanceDate >= today &&x.MaintenanceDate < tomorrow).FirstOrDefault();
- if (maint == null)
+ var user = BaseDal.QueryData();//妫�淇〃
+ var maint = user.Where(x => x.UserAccount == account).FirstOrDefault();
+ var sysuer = _user.QueryData(x => x.UserName == account).FirstOrDefault();//鐢ㄦ埛琛�
+ if (maint == null || sysuer == null)
{
- return new WebResponseContent { Status = false, Message = "鏈壘鍒板彲鐢ㄧ殑缁存姢浠诲姟璁板綍" };
+ return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌璇ョ敤鎴�" };
}
- // 淇敼鍏剁粨鏉熸椂闂�
- maint.MaintenancEendTime = DateTime.Now;
- maint.IsPossible = "ok";//ok灏变唬琛ㄥ畬鎴愪簡
+ if (maint.IsLeader == 1)//濡傛灉璇ョ敤鎴锋槸鐝暱锛岄偅涔堣绛夊叏閮ㄤ汉閮芥淇畬鎴愶紝浠栨墠鍙互缁撴潫妫�淇�
+ {
+ //鍏堟煡鎵炬墍鏈夌敤鎴风殑缁勬槸閭ｄ釜缁勭殑锛岀粍鍛樼姸鎬佹湁涓�涓笉鏄�1
+ //var monitor = user.Where(x => x.Roleid == maint.Roleid && x.IsLeader == 0 && x.MaintenanceStatus == 1).ToList();
+ //if (monitor.Count >0)
+ //{
+ // return new WebResponseContent { Status = false, Message = "浣犵殑缁勫憳杩樻病鏈夊畬鎴�" };
+ //}
+ // 鏌ユ壘鍚岀粍鏈畬鎴愮殑缁勫憳锛圛sLeader=0 && MaintenanceStatus=1锛�
+ bool hasUnfinishedMembers = user.Any(x =>x.Roleid == maint.Roleid && x.IsLeader == 0 &&
+ x.MaintenanceStatus == 1); //锛欰ny()鏈変竴涓弧瓒冲氨杩斿洖true琛ㄧず瀛樺湪婊¤冻鏉′欢鐨勮褰�
+ if (hasUnfinishedMembers)
+ {
+ return new WebResponseContent { Status = false, Message = "杩樻湁缁勫憳鏈畬鎴愬綋鍓嶆壒娆℃淇�" };
+ }
+ }
+ //濡傛灉婊¤冻涓嬮潰鐨勬潯浠跺氨寮�濮�
+ maint.MaintenancEendTime = DateTime.Now;//璁板綍缁撴潫鏃堕棿
+ maint.MaintenanceStatus = 0;//鏇存敼鐘舵��
BaseDal.UpdateData(maint);
- return new WebResponseContent { Status = true, Data = maint };
+ ////鎻掑叆璁板綍琛�
+ //var recording = new Dt_MaintenanceTeam //娣诲姞璁板綍
+ //{
+ // OperatorName = sysuer.UserTrueName,
+ // TeamName = sysuer.RoleName,
+ // DistributionTime = DateTime.Now,
+ // EndTime=DateTime.Now,
+ //};
+ //_team.AddData(recording);
+ return new WebResponseContent { Status = true, Data = maint, Message = "瀹屾垚妫�淇�" };
}
catch (Exception ex)
{
-
return new WebResponseContent { Status = false, Message = "閿欒淇℃伅锛�" + ex.Message };
}
}
-
/// <summary>
--
Gitblit v1.9.3