From b9c76ce85e533250cd36de670146530f970859e7 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 01 八月 2025 11:29:49 +0800
Subject: [PATCH] 修改伸缩杆接口
---
项目代码/后端/后台管理/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs | 48 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 36 insertions(+), 12 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs"
index 291c7d3..c32991e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/\345\220\216\347\253\257/\345\220\216\345\217\260\347\256\241\347\220\206/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs"
@@ -38,11 +38,15 @@
var main = Db.Queryable<Dt_MaintenanceTeam>();
+
+ var query = sys.InnerJoin<Dt_MaintenanceTeam>((a, b) => a.UserTrueName == b.OperatorName)
+ ;
+
+
//妯＄硦鏌ヨ
- var query = sys.InnerJoin<Dt_MaintenanceTeam>((a, b) => a.UserTrueName == b.OperatorName);
- if (!string .IsNullOrEmpty(pagination.searchKeyword))
+ if (!string.IsNullOrEmpty(pagination.searchKeyword))
{
-
+
query = query.Where((a, b) =>
b.OperatorName.Contains(pagination.searchKeyword) ||
b.TeamName.Contains(pagination.searchKeyword) ||
@@ -50,7 +54,7 @@
);
}
//鏃堕棿鏌ヨ
- if (pagination.startDate.HasValue&&pagination.endDate.HasValue)
+ if (pagination.startDate.HasValue && pagination.endDate.HasValue)
{
query = query.Where((a, b) => b.DistributionTime >= pagination.startDate && b.DistributionTime <= pagination.endDate);
}
@@ -68,34 +72,54 @@
//"Modifier" => isAsc ? query.OrderBy((a, b) => b.Modifier) : query.OrderByDescending((a, b) => b.Modifier),
- _ => query.OrderByDescending((a, b) => b.Creater), // 榛樿鎸夊垱寤烘椂闂撮檷搴�
+ _ => query.OrderByDescending((a, b) => b.CreateDate), // 榛樿鎸夊垱寤烘椂闂撮檷搴�
};
}
else
{
//榛樿鎸夊垱寤烘椂闂撮檷搴忔帓搴�
- query = query.OrderByDescending((a, b) => b.Creater);
+ query = query.OrderByDescending((a, b) => b.CreateDate);
}
+ //// 濡傛灉涓嶆槸绠＄悊鍛橈紝鏍规嵁閮ㄩ棬杩囨护
+ //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
+ var result = query
.Select((a, b) => new
{
-
+ b.ID,
a.User_Id,
a.Dept_Id,//杞ㄩ亾绔�
a.IsLeader,//鏄惁鏄彮闀�
- a.RoleName,
a.Role_Id,
+ a.RoleName,//瑙掕壊鍚嶇О
+ a.Unit,//鍗曚綅
b.IPAddress,//鐢佃剳ip鍦板潃
b.OperatorName,
- b.TeamName,
+ b.TeamName,//鐝粍
+ b.MaintenanceStatus,//妫�淇姸鎬�
b.Creater,
a.HeadImageUrl,
b.DistributionTime,
+ b.EndTime,
b.Modifier,
-
}).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
return new WebResponseContent
{
@@ -113,7 +137,7 @@
catch (Exception ex)
{
- return new WebResponseContent { Status = false,Message="閿欒淇℃伅锛�"+ex.Message };
+ return new WebResponseContent { Status = false, Message = "閿欒淇℃伅锛�" + ex.Message };
}
}
--
Gitblit v1.9.3