From 9250e3e48760f91fbefef03331fc7b14b4b1be18 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期六, 07 六月 2025 13:09:59 +0800
Subject: [PATCH] 修改数字大屏接口
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs | 64 +++++++-------------------------
1 files changed, 14 insertions(+), 50 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
index 81671f3..0454faa 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs
@@ -111,42 +111,22 @@
/// <summary>
- /// 浜哄憳鐩戞帶
+ /// 浜哄憳鐩戞帶锛堟暟瀛楀ぇ灞忥級
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="searchKeyword"></param>
- /// <returns></returns>(杩欎釜娌℃湁鐢ㄥ埌浜�)
+ /// <returns></returns>
public WebResponseContent PersonnelMonitoring(PaginationDTO pagination)
{
try
{
- // 绗竴姝ワ細鑷姩娓呯悊杩囨湡妫�淇姸鎬�
- var today = DateTime.Today;
- var recordsToUpdate = Db.Queryable<Dt_Maintenance>()
- .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
- record.IsPossible = "NULL"; //鏇存敼鐘舵�佷负false涓嶈繍琛屾淇�//榛樿涓篘ULL
- }
- Db.Updateable(recordsToUpdate).ExecuteCommand();
- }
-
int totalCount = 0;
var sys = _user.Db.Queryable<Sys_User>();
- var main = Db.Queryable<Dt_Maintenance>();
+
var query = sys.InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount)
- .Where((a, b) => b.IsPossible == "true"); // 灞曠ず杩愯妫�淇殑
+ .Where((a, b) => b.MaintenanceStatus==1); // 灞曠ず杩愯妫�淇殑
// 鎼滅储鍏抽敭瀛�
if (!string.IsNullOrEmpty(pagination.searchKeyword))
@@ -156,37 +136,21 @@
a.Userteam.Contains(pagination.searchKeyword));
}
- // 鐘舵�佸弬鏁�
- if (pagination.status.HasValue)
- {
- query = query.Where((a, b) => b.MaintenanceStatus == pagination.status.Value);
- }
-
- // 濡傛灉涓嶆槸绠＄悊鍛橈紝璇锋寜閮ㄩ棬杩囨护
- 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);
- }
+ //// 鐘舵�佸弬鏁�
+ //if (pagination.status.HasValue) //澶氫紶涓�涓姸鎬�
+ //{
+ // query = query.Where((a, b) => b.MaintenanceStatus == pagination.status.Value);
+ //}
var result = query
.Select((a, b) => new
{
a.UserTrueName,
- a.Userteam,
- a.HeadImageUrl,
- b.MaintenanceStatus,
- b.MaintenanceDate,
- b.IsPossible,
+ a.Userteam,//鐝粍
+ a.Unit,//鍗曚綅
+ b.MaintenanceStatus,//妫�淇姸鎬�
+ b.CreateDate,//鏃ユ湡
+ b.MaintenancStartTime,//寮�濮嬫椂闂�
})
.ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
--
Gitblit v1.9.3