From 2d4e07b5d61490d3c3cfeb398d3d6e4b6f8be9bb Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 28 三月 2025 09:28:18 +0800
Subject: [PATCH] 111
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 164 insertions(+), 0 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs"
index e772d08..c4de149 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs"
@@ -9,6 +9,12 @@
using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_ITelescopicService;
using WIDESEAWCS_Model.Models;
+<<<<<<< Updated upstream
+=======
+using WIDESEAWCS_DTO;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
+using WIDESEAWCS_DTO.Telescopic;
+>>>>>>> Stashed changes
namespace WIDESEAWCS_TelescopicService
{
@@ -21,14 +27,19 @@
{
_user = user;
}
+<<<<<<< Updated upstream
public WebResponseContent ShowMaintence()
+=======
+ public WebResponseContent ShowMaintence(PaginationDTO pagination)
+>>>>>>> Stashed changes
{
try
{
var sys = _user.QueryData();
var main = BaseDal.QueryData();
+<<<<<<< Updated upstream
var result = sys.Join(main,
u => u.UserName,
m => m.UserAccount,
@@ -42,6 +53,39 @@
m.IsPossible,
});
return new WebResponseContent { Status = true, Data = result };
+=======
+ var query = sys.InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount);
+ if (!string.IsNullOrEmpty(pagination.searchKeyword))
+ {
+ query = query.Where((a, b) =>
+ a.UserTrueName.Contains(pagination.searchKeyword) ||
+ a.UserName.Contains(pagination.searchKeyword) ||
+ a.CardNumber.ToString().Contains(pagination.searchKeyword)||
+ a.Userteam.Contains(pagination.searchKeyword)
+ );
+ }
+ var result= query .Select((a, b) => new
+ {
+ b.ID,
+ a.UserTrueName,
+ a.UserName,
+ a.CardNumber,
+ a.Userteam,
+ a.HeadImageUrl,
+ b.IsPossible
+ }).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
+ return new WebResponseContent
+ {
+ Status = true,
+ Data = new
+ {
+ TotalCount = totalCount,//鎬绘暟
+ PageIndex = pagination.pageIndex,//椤垫暟
+ PageSize = pagination.pageSize,//涓�椤靛灏戜釜鏁版嵁
+ Items = result
+ }
+ };
+>>>>>>> Stashed changes
}
catch (Exception ex)
{
@@ -50,13 +94,28 @@
}
}
+<<<<<<< Updated upstream
public WebResponseContent PersonnelMonitoring(bool ispossible)
+=======
+
+
+
+ /// <summary>
+ /// 妯＄硦鏌ヨ
+ /// </summary>
+ /// <param name="pageIndex"></param>
+ /// <param name="pageSize"></param>
+ /// <param name="searchKeyword"></param>
+ /// <returns></returns>
+ public WebResponseContent PersonnelMonitoring(PaginationDTO pagination)
+>>>>>>> Stashed changes
{
try
{
var sys = _user.QueryData();
var main = BaseDal.QueryData();
+<<<<<<< Updated upstream
var result = sys.Join(main,
u => u.UserName,
m => m.UserAccount,
@@ -70,6 +129,48 @@
m.IsPossible,
}).Where(x=>x.IsPossible== ispossible);
return new WebResponseContent { Status = true, Data = result };
+=======
+ var query = sys.InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount)
+ .Where((a, b) => b.IsPossible == "true"); // 鍏堢瓫閫� IsPossible 涓� true 鐨勬暟鎹�
+
+ // 濡傛灉鎻愪緵浜嗘悳绱㈠叧閿瓧锛屽垯杩涜妯＄硦鏌ヨ
+ if (!string.IsNullOrEmpty(pagination.searchKeyword))
+ {
+ query = query.Where((a, b) =>
+ a.UserTrueName.Contains(pagination.searchKeyword) || // 鎸夌湡瀹炲鍚嶆ā绯婃悳绱�
+ a.Userteam.Contains(pagination.searchKeyword)); // 鎸夌敤鎴风彮缁勬ā绯婃悳绱�
+ }
+
+ // 濡傛灉鎻愪緵浜� status 鍙傛暟锛屽垯鎸夌姸鎬佺瓫閫�
+ if (pagination.status.HasValue)//绛変环if锛坰tatus锛�=null锛�
+ {
+ 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,
+ })
+ .ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount); // 鍒嗛〉
+
+ return new WebResponseContent
+ {
+ Status = true,
+ Data = new
+ {
+ TotalCount = totalCount, // 鎬绘暟
+ PageIndex = pagination.pageIndex, // 褰撳墠椤电爜
+ PageSize = pagination.pageSize, // 姣忛〉鏁版嵁閲�
+ Items = result
+ }
+ };
+>>>>>>> Stashed changes
}
catch (Exception ex)
{
@@ -134,6 +235,69 @@
}
/// <summary>
+<<<<<<< Updated upstream
+=======
+ /// 妫�淇搷浣滆褰�
+ /// </summary>
+ /// <param name="pageIndex">椤垫暟</param>
+ /// <param name="pageSize">涓�椤靛灏戜釜鏁版嵁</param>
+ /// <returns></returns>
+ public WebResponseContent MaintenanceOperationRecord(PaginationDTO pagination)
+ {
+ try
+ {
+ 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);
+
+ if (!string.IsNullOrEmpty(pagination.searchKeyword))
+ {
+ query = query.Where((a, b) =>
+ a.UserTrueName.Contains(pagination.searchKeyword)||
+ a.Userteam.Contains(pagination.searchKeyword)||
+ a.HeadImageUrl.Contains(pagination.searchKeyword)
+ );
+ }
+
+ if (pagination.startDate.HasValue && pagination.endDate.HasValue)
+ {
+ query = query.Where((a, b) => b.MaintenancStartTime >= pagination.startDate.Value && b.MaintenancStartTime <= pagination.endDate.Value);
+ }
+
+ var result = query.Select((a, b) => new
+ {
+ a.UserTrueName,
+ a.Userteam,
+ a.HeadImageUrl,
+ b.MaintenancStartTime,
+ b.MaintenancEendTime,
+ }).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
+
+ return new WebResponseContent
+ {
+ Status = true,
+ Data = new
+ {
+ TotalCount = totalCount,//鎬绘暟
+ PageIndex = pagination.pageIndex,//椤垫暟
+ PageSize = pagination.pageSize,//涓�椤靛灏戜釜鏁版嵁
+ Items = result
+ }
+ };
+ }
+ catch (Exception ex)
+ {
+
+ return new WebResponseContent { Status = false, Message = "閿欒淇℃伅锛�" + ex.Message };
+ }
+ }
+
+
+
+ /// <summary>
+>>>>>>> Stashed changes
/// 鐘舵�佹灇涓�
/// </summary>
private enum Maint
--
Gitblit v1.9.3