From 7876ac5d67b12e206a68db17c4034df52fa2f060 Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期五, 06 六月 2025 09:23:38 +0800
Subject: [PATCH] 1
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs | 94 ++++++++++++++++++++++++++++++++---------------
1 files changed, 64 insertions(+), 30 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
index 4619a7b..81671f3 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
@@ -23,13 +23,13 @@
public IRepository<Dt_Maintenance> Repository => BaseDal;
public readonly IRepository<Dt_MaintenanceTeam> _team;
private readonly IRepository<Sys_User> _user;
- private readonly IRepository<Sys_Role> _role;
+
- public MaintenanceService(IRepository<Sys_Role> role,IRepository<Dt_Maintenance> BaseDal, IRepository<Sys_User> user, IRepository<Dt_MaintenanceTeam> team) : base(BaseDal)
+ public MaintenanceService(IRepository<Dt_Maintenance> BaseDal, IRepository<Sys_User> user, IRepository<Dt_MaintenanceTeam> team) : base(BaseDal)
{
_user = user;
_team = team;
- _role = role;
+
}
@@ -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
{
@@ -604,13 +588,22 @@
try
{
var user = BaseDal.QueryData();//妫�淇〃
- var Role = _role.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 = "娌℃湁鎵惧埌璇ョ敤鎴�" };
}
+ // 鏌ユ壘璇ョ敤鎴峰湪 _team 琛ㄤ腑鐨勬渶鏂颁竴鏉¤褰�
+ var lastRecord = _team.QueryData(x => x.Account == account)
+ .OrderByDescending(x => x.CreateDate)
+ .FirstOrDefault();
+
+ if (lastRecord != null && lastRecord.MaintenanceStatus == 1)
+ {
+ return new WebResponseContent { Status = false, Message = "浣犲凡缁忓湪寮�濮嬫淇簡锛岃涓嶈閲嶅鐐瑰嚮" };
+ }
+
//鍏堣鎵惧埌璇ョ敤鎴峰睘浜庨偅涓鑹茬殑锛岃繖涓鑹蹭腑灞炰簬閭ｄ釜浠�涔堢被鍨嬶紙缁勯暱/缁勫憳锛�
if (maint.IsLeader != 1)//濡傛灉璇ョ敤鎴蜂笉鏄彮闀匡紝閭ｄ箞瑕佺瓑鐝暱鍏堝仛锛屼粬鎵嶅彲浠ュ仛
{
@@ -621,6 +614,10 @@
}
}
+ if (true)
+ {
+
+ }
//濡傛灉婊¤冻涓嬮潰鐨勬潯浠跺氨寮�濮�
maint.MaintenancStartTime = DateTime.Now;//璁板綍寮�濮嬫椂闂�
maint.MaintenanceStatus = 1;//鏇存敼鐘舵��
@@ -628,6 +625,8 @@
//鎻掑叆璁板綍琛�
var recording = new Dt_MaintenanceTeam //娣诲姞璁板綍
{
+ Account = account,
+ MaintenanceStatus=1,
OperatorName = sysuer.UserTrueName,
TeamName = sysuer.RoleName,
DistributionTime = DateTime.Now,
@@ -660,6 +659,17 @@
{
return new WebResponseContent { Status = false, Message = "娌℃湁鎵惧埌璇ョ敤鎴�" };
}
+
+ // 鏌ユ壘璇ョ敤鎴峰湪 _team 琛ㄤ腑鐨勬渶鏂颁竴鏉¤褰�
+ var lastRecord = _team.QueryData(x => x.Account == account)
+ .OrderByDescending(x => x.CreateDate)
+ .FirstOrDefault();
+
+ if (lastRecord == null || lastRecord.MaintenanceStatus != 1)
+ {
+ return new WebResponseContent { Status = false, Message = "浣犺繕娌℃湁寮�濮嬫淇紝璇峰厛鐐瑰嚮寮�濮嬫淇�" };
+ }
+
if (maint.IsLeader == 1)//濡傛灉璇ョ敤鎴锋槸鐝暱锛岄偅涔堣绛夊叏閮ㄤ汉閮芥淇畬鎴愶紝浠栨墠鍙互缁撴潫妫�淇�
{
//鍏堟煡鎵炬墍鏈夌敤鎴风殑缁勬槸閭ｄ釜缁勭殑锛岀粍鍛樼姸鎬佹湁涓�涓笉鏄�1
@@ -675,14 +685,15 @@
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 //娣诲姞璁板綍
+ {
+ Account = account,
+ MaintenanceStatus=0,
+ OperatorName = sysuer.UserTrueName,
+ TeamName = sysuer.RoleName,
+ EndTime = DateTime.Now,
+ };
+ _team.AddData(recording);
return new WebResponseContent { Status = true, Data = maint, Message = "瀹屾垚妫�淇�" };
}
@@ -692,6 +703,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