From ddd76ee6d260d164e0bf76fe96651b8a583fdf8b Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期三, 13 八月 2025 15:58:52 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs | 87 +------------------------------------------
1 files changed, 2 insertions(+), 85 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
index e970789..5846816 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskUsers/Queries/TaskUserQueryHandler.cs
@@ -17,8 +17,7 @@
public class TaskUserQueryHandler(
IRepository<TaskInfoUser> rep) :
IRequestHandler<GetTaskUsersQuery, GetTaskUsersQueryResult>,
- IRequestHandler<GetArrangeTaskUsersQuery, GetArrangeTaskUsersQueryResult>,
- IRequestHandler<GetCheckReceiveTaskUserInfosQuery, GetCheckReceiveTaskUserInfosQueryResult>
+ IRequestHandler<GetArrangeTaskUsersQuery, GetArrangeTaskUsersQueryResult>
{
private readonly IRepository<TaskInfoUser> rep = rep;
@@ -49,6 +48,7 @@
.Select(it => new GetTaskUsersQueryResultItem
{
Id = it.Id,
+ EnterpriseEmployeeId = it.EnterpriseEmployeeId,
Avatar = it.EnterpriseEmployee.User.Avatar,
Name = it.EnterpriseEmployee.User.Name,
Identity = it.EnterpriseEmployee.User.Identity,
@@ -119,89 +119,6 @@
ArrangeStatus = it.ArrangeStatus
});
return await request.PageModel.GetPagedListAsync<GetArrangeTaskUsersQueryResult, GetArrangeTaskUsersQueryResultItem>(s, cancellationToken);
- }
-
- /// <summary>
- /// 鏌ヨ楠屾敹鍒嗛〉鍒楄〃
- /// </summary>
- /// <param name="request"></param>
- /// <param name="cancellationToken"></param>
- /// <returns></returns>
- public async Task<GetCheckReceiveTaskUserInfosQueryResult> Handle(GetCheckReceiveTaskUserInfosQuery request, CancellationToken cancellationToken)
- {
- var logier = JwtUtils.GetCurrentLogier();
- var q = rep.AsQueryable().AsNoTracking()
- .OrderBy(it => it.CreatedTime)
- .AsQueryable();
-
- if (logier.Type == EnumUserType.Personal)
- {
- q = q.Where(it => it.EnterpriseEmployee.UserId == logier.Id);
- }
- else if (logier.Type == EnumUserType.Enterprise)
- {
- q = q.Where(it => it.TaskInfo.EnterpriseId == logier.EnterpriseId);
- }
- if (request.TaskInfoId.HasValue)
- {
- q = q.Where(it => it.TaskInfoId == request.TaskInfoId);
- }
- if (request.Keywords.IsNotNull())
- {
- q = q.Where(it =>
- it.EnterpriseEmployee.User.Name.Contains(request.Keywords)
- || it.EnterpriseEmployee.User.ContactPhoneNumber.Contains(request.Keywords)
- || it.EnterpriseEmployee.User.Identity.Contains(request.Keywords));
- }
- if (logier.ClientType == EnumClientType.Wxmp)
- {
- if (request.CheckReceiveStatus == null)
- {
- throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨楠屾敹鐘舵��");
- }
- if (request.DateBegin == null || request.DateEnd == null)
- {
- throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨鏃ユ湡");
- }
- q = q.Where(it => it.Submits.Any(s =>
- request.DateBegin.Value.Date <= s.Date.Date
- && s.Date.Date <= request.DateEnd.Value.Date
- && (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit
- ? s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Submit
- : request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitCheckReceive
- ? s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Wait
- : (s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Success
- || s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Fail))));
- }
- else
- {
- if (request.DateBegin.HasValue && request.DateEnd.HasValue)
- {
- q = q.Where(it => it.Submits.Any(s =>
- request.DateBegin.Value.Date <= s.Date.Date
- && s.Date.Date <= request.DateEnd.Value.Date));
- }
- if (request.CheckReceiveStatus.HasValue)
- {
- q = q.Where(it => it.CheckReceiveStatus == request.CheckReceiveStatus);
- }
- }
- var s = q.Select(it => new GetCheckReceiveTaskUserInfosQueryResultItem
- {
- Id = it.TaskInfoId,
- TaskName = it.TaskInfo.Name,
- BeginTime = it.TaskInfo.BeginTime,
- EndTime = it.TaskInfo.EndTime,
- AddressName = it.TaskInfo.AddressName,
- Name = it.EnterpriseEmployee.User.Name,
- Identity = it.EnterpriseEmployee.User.Identity,
- Age = it.EnterpriseEmployee.User.Age,
- Gender = it.EnterpriseEmployee.User.Gender,
- ContactPhoneNumber = it.EnterpriseEmployee.User.ContactPhoneNumber,
- CheckReceiveStatus = it.CheckReceiveStatus,
- LastSubmitTime = it.LastSubmitTime,
- });
- return await request.PageModel.GetPagedListAsync<GetCheckReceiveTaskUserInfosQueryResult, GetCheckReceiveTaskUserInfosQueryResultItem>(s, cancellationToken);
}
}
}
--
Gitblit v1.9.1