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/MaintenanceTeamService.cs | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs"
index 317b221..ea14d42 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs"
@@ -5,6 +5,7 @@
using System.Threading.Tasks;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_DTO.Telescopic;
using WIDESEAWCS_Model.Models;
namespace WIDESEAWCS_ITelescopicService
@@ -19,5 +20,67 @@
}
+<<<<<<< Updated upstream
+=======
+ /// <summary>
+ /// 妫�淇缃褰�
+ /// </summary>
+ /// <returns></returns>
+ /// <exception cref="NotImplementedException"></exception>
+ public WebResponseContent MaintenanceSettingRecord(PaginationDTO pagination)
+ {
+ try
+ {
+ int totalCount = 0;
+
+ var sys = _user.Db.Queryable<Sys_User>();
+ var main = Db.Queryable<Dt_MaintenanceTeam>();
+
+ var query = sys.InnerJoin<Dt_MaintenanceTeam>((a, b) => a.UserTrueName == b.OperatorName);
+ if (!string .IsNullOrEmpty(pagination.searchKeyword))
+ {
+
+ query = query.Where((a, b) =>
+ b.OperatorName.Contains(pagination.searchKeyword) ||
+ b.TeamName.Contains(pagination.searchKeyword) ||
+ b.Modifier.Contains(pagination.searchKeyword)
+ );
+ }
+ if (pagination.startDate.HasValue&&pagination.endDate.HasValue)
+ {
+ query = query.Where((a, b) => b.DistributionTime >= pagination.startDate && b.DistributionTime <= pagination.endDate);
+ }
+ var result=query
+ .Select((a, b) => new
+ {
+ a.User_Id,
+ b.OperatorName,
+ b.TeamName,
+ a.HeadImageUrl,
+ b.DistributionTime,
+ b.Modifier,
+ }).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 };
+ }
+
+ }
+
+>>>>>>> Stashed changes
}
}
--
Gitblit v1.9.3