From 20af9888642273b5ff389f1fd8e80582083ef0b5 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 11 九月 2025 15:52:17 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs | 191 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 169 insertions(+), 22 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
index 3f46ec6..e237a65 100644
--- a/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/Tasks/Queries/TaskInfoQueryHandler.cs
@@ -20,10 +20,14 @@
IRepository<DictionaryData> repDictionaryData
) :
IRequestHandler<GetTaskInfoQuery, GetTaskInfoQueryResult>,
+ IRequestHandler<GetOpenTaskInfosQuery, GetTaskInfosQueryResult>,
IRequestHandler<GetTaskInfosQuery, GetTaskInfosQueryResult>,
IRequestHandler<GetPersonalApplyTaskInfosQuery, GetPersonalApplyTaskInfosQueryResult>,
IRequestHandler<GetPersonalHireTaskInfosQuery, GetPersonalHireTaskInfosQueryResult>,
- IRequestHandler<GetPersonalCancelTaskInfosQuery, GetPersonalCancelTaskInfosQueryResult>
+ IRequestHandler<GetPersonalCancelTaskInfosQuery, GetPersonalCancelTaskInfosQueryResult>,
+ IRequestHandler<GetSettlementTasksQuery, GetSettlementTasksQueryResult>,
+ IRequestHandler<GetSettlementTaskQuery, GetSettlementTaskQueryResult>,
+ IRequestHandler<GetTaskSelectQuery, List<SelectOption<Guid, GetTaskSelectQueryOption>>>
{
private readonly IRepository<TaskInfo> rep = rep;
@@ -37,6 +41,7 @@
/// <returns></returns>
public async Task<GetTaskInfoQueryResult> Handle(GetTaskInfoQuery request, CancellationToken cancellationToken)
{
+ var now = DateTime.Now;
var logier = JwtUtils.GetCurrentLogier();
var model = await TaskInfoRepository.GetQueryable(rep)
.Where(it => it.Id == request.Id)
@@ -48,15 +53,56 @@
.CountAsync(it => it.TaskInfoId == model.Id);
if (logier != null && logier.Type == EnumUserType.Personal)
{
- model.HireStatus = await rep.Change<TaskInfoUser>().AsQueryable().AsNoTracking()
+ var taskUser = await rep.Change<TaskInfoUser>().AsQueryable().AsNoTracking()
.Include(it => it.EnterpriseEmployee)
.Where(it => it.TaskInfoId == model.Id && it.EnterpriseEmployee.UserId == logier.Id)
- .Select(it => it.EnterpriseEmployee.HireStatus)
+ .Select(it => new
+ {
+ it.Id,
+ it.HireStatus,
+ it.EnterpriseEmployeeId,
+ it.EnterpriseEmployee.UserSignContractStatus
+ })
.FirstOrDefaultAsync();
- model.IsCollected = await rep.Change<UserTaskCollect>().AsQueryable().AsNoTracking()
+ if (taskUser != null)
+ {
+ model.EnterpriseEmployeeId = taskUser.EnterpriseEmployeeId;
+ model.HireStatus = taskUser.HireStatus;
+ model.ApplyButton = taskUser.HireStatus == EnumTaskUserHireStatus.Wait
+ ? GetTaskInfoQueryResultApplyButton.WaitHire
+ : taskUser.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait
+ ? GetTaskInfoQueryResultApplyButton.WaitSignContract
+ : null;
+ model.HireButton = now < model.BeginTime
+ ? GetTaskInfoQueryResultHireButton.Wait
+ : model.BeginTime <= now && now <= model.EndTime
+ ? GetTaskInfoQueryResultHireButton.InProcess
+ : GetTaskInfoQueryResultHireButton.Completed;
+ if (model.HireButton == GetTaskInfoQueryResultHireButton.InProcess)
+ {
+ var submit = await rep.Change<TaskInfoUserSubmit>().AsQueryable().AsNoTracking()
+ .AnyAsync(it => it.TaskInfoUserId == taskUser.Id && it.CheckReceiveStatus >= EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive);
+ if (!submit)
+ {
+ model.HireButton = GetTaskInfoQueryResultHireButton.ApplyCheckReceive;
+ }
+ }
+ }
+ model.IsCollected = await rep.Change<TaskUserCollect>().AsQueryable().AsNoTracking()
.AnyAsync(it => it.TaskInfoId == request.Id && it.UserId == logier.Id);
}
return model;
+ }
+
+ /// <summary>
+ /// 鏌ヨ寮�鏀句换鍔″垎椤靛垪琛�
+ /// </summary>
+ /// <param name="request"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public Task<GetTaskInfosQueryResult> Handle(GetOpenTaskInfosQuery request, CancellationToken cancellationToken)
+ {
+ return Handle(request.Adapt<GetTaskInfosQuery>(), cancellationToken);
}
/// <summary>
@@ -79,7 +125,7 @@
}
if (request.BeginTime.HasValue && request.EndTime.HasValue)
{
- q = q.Where(it => request.BeginTime <= it.BeginTime && it.BeginTime <= request.EndTime);
+ q = q.Where(it => request.BeginTime <= it.CreatedTime && it.CreatedTime <= request.EndTime);
}
if (request.CityCode.IsNotNull())
{
@@ -97,6 +143,10 @@
{
q = q.Where(it => it.GenderLimit == request.GenderLimit);
}
+ if (logier != null && logier.Type == EnumUserType.Personal && request.IsCollected == true)
+ {
+ q = q.Where(it => it.TaskUserCollects.Any(c => c.UserId == logier.Id));
+ }
var count = new GetTaskInfosQueryResultObjectData
{
@@ -108,7 +158,14 @@
if (request.Status.HasValue)
{
- q = q.Where(it => it.Status == request.Status);
+ if (request.Status == EnumTaskStatus.Wait)
+ {
+ q = q.Where(it => it.ReleaseStatus == EnumTaskReleaseStatus.InProcess && it.Status == EnumTaskStatus.Wait);
+ }
+ else
+ {
+ q = q.Where(it => it.Status == request.Status);
+ }
}
if (request.ReleaseStatus.HasValue)
{
@@ -128,6 +185,8 @@
Id = t.Id,
Name = t.Name,
Code = t.Code,
+ EnterpriseName = t.Enterprise.EnterpriseName,
+ UserName = t.Enterprise.Users.Where(u => u.Id == t.CreatedUserId).Select(u => u.UserName).FirstOrDefault(),
BillingMethod = t.BillingMethod,
ServiceFee = t.ServiceFee,
SettlementCycle = t.SettlementCycle,
@@ -158,7 +217,15 @@
CheckReceiveStatus = t.CheckReceiveStatus,
CreatedTime = t.CreatedTime,
RecommendStatus = t.RecommendStatus,
- SettlementStatus = t.SettlementStatus
+ RecommendTime = t.RecommendTime,
+ SettlementStatus = t.SettlementStatus,
+ HireStatus = logier != null && logier.Type == EnumUserType.Personal
+ ? t.TaskInfoUsers
+ .Where(tu => tu.EnterpriseEmployee.UserId == logier.Id)
+ .Select(tu => tu.HireStatus as EnumTaskUserHireStatus?)
+ .FirstOrDefault()
+ : null,
+
};
var result = await request.PageModel.GetPagedListAsync<GetTaskInfosQueryResult, GetTaskInfosQueryResultItem>(s, cancellationToken);
result.ObjectData = count;
@@ -183,7 +250,7 @@
q = q.Where(it =>
it.TaskInfoUsers.Any(tu =>
tu.EnterpriseEmployee.UserId == logier.Id
- && tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Wait));
+ && tu.HireStatus == EnumTaskUserHireStatus.Wait));
break;
case GetPersonalApplyTaskInfosQueryStatus.WaitSignContract:
q = q.Where(it =>
@@ -200,7 +267,7 @@
q = q.Where(it =>
it.TaskInfoUsers.Any(tu =>
tu.EnterpriseEmployee.UserId == logier.Id
- && (tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Wait
+ && (tu.HireStatus == EnumTaskUserHireStatus.Wait
|| tu.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait)));
}
var s = q.Select(it => new GetPersonalApplyTaskInfosQueryResultItem
@@ -220,7 +287,7 @@
AddressName = it.AddressName,
Status = it.TaskInfoUsers.Any(it =>
it.EnterpriseEmployee.UserId == logier.Id
- && it.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Wait)
+ && it.HireStatus == EnumTaskUserHireStatus.Wait)
? GetPersonalApplyTaskInfosQueryStatus.WaitHire
: GetPersonalApplyTaskInfosQueryStatus.WaitSignContract
});
@@ -240,14 +307,16 @@
var q = TaskInfoRepository.GetQueryable(rep, true, logier).Where(it =>
it.TaskInfoUsers.Any(tu =>
tu.EnterpriseEmployee.UserId == logier.Id
- && tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Pass
&& tu.ArrangeStatus == EnumTaskUserArrangeStatus.Complete));
if (request.Status.HasValue)
{
switch (request.Status.Value)
{
+ case GetPersonalHireTaskInfosQueryStatus.Wait:
+ q = q.Where(it => now < it.BeginTime);
+ break;
case GetPersonalHireTaskInfosQueryStatus.InProcess:
- q = q.Where(it => now <= it.EndTime);
+ q = q.Where(it => it.BeginTime <= now && now <= it.EndTime);
break;
case GetPersonalHireTaskInfosQueryStatus.Completed:
q = q.Where(it => it.EndTime < now);
@@ -255,14 +324,6 @@
default:
break;
}
- }
- else
- {
- q = q.Where(it =>
- it.TaskInfoUsers.Any(tu =>
- tu.EnterpriseEmployee.UserId == logier.Id
- && (tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Wait
- || tu.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Wait)));
}
var s = q.Select(it => new GetPersonalHireTaskInfosQueryResultItem
{
@@ -279,7 +340,9 @@
BenefitContent = it.Benefit.Content
}).ToList(),
AddressName = it.AddressName,
- Status = now <= it.EndTime
+ Status = now < it.BeginTime
+ ? GetPersonalHireTaskInfosQueryStatus.Wait
+ : it.BeginTime <= now && now <= it.EndTime
? GetPersonalHireTaskInfosQueryStatus.InProcess
: GetPersonalHireTaskInfosQueryStatus.Completed
});
@@ -299,7 +362,7 @@
var q = TaskInfoRepository.GetQueryable(rep, true, logier).Where(it =>
it.TaskInfoUsers.Any(tu =>
tu.EnterpriseEmployee.UserId == logier.Id
- && (tu.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Refuse
+ && (tu.HireStatus == EnumTaskUserHireStatus.Refuse
|| tu.EnterpriseEmployee.UserSignContractStatus == EnumTaskUserSignContractStatus.Refuse
|| tu.EnterpriseEmployee.EnterpriseSignContractStatus == EnumTaskUserSignContractStatus.Refuse)));
var s = q.Select(it => new GetPersonalCancelTaskInfosQueryResultItem
@@ -320,5 +383,89 @@
});
return await request.PageModel.GetPagedListAsync<GetPersonalCancelTaskInfosQueryResult, GetPersonalCancelTaskInfosQueryResultItem>(s, cancellationToken);
}
+
+ /// <summary>
+ /// 鏌ヨ缁撶畻浠诲姟鍒嗛〉鍒楄〃鏁版嵁
+ /// </summary>
+ /// <param name="request"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<GetSettlementTasksQueryResult> Handle(GetSettlementTasksQuery request, CancellationToken cancellationToken)
+ {
+ var logier = JwtUtils.GetCurrentLogier();
+ var q = TaskInfoRepository.GetQueryable(rep, true, logier)
+ .Where(it => it.SettlementOrderStatus.HasValue);
+ if (request.Keywords.IsNotNull())
+ {
+ q = q.Where(it =>
+ it.Name.Contains(request.Keywords)
+ || it.Code.Contains(request.Keywords));
+ }
+ if (request.SettlementOrderStatus.HasValue)
+ {
+ q = q.Where(it => it.SettlementOrderStatus == request.SettlementOrderStatus);
+ }
+ if (request.SettlementStatus.HasValue)
+ {
+ q = q.Where(it => it.SettlementStatus == request.SettlementStatus);
+ }
+ var s = q
+ .Select(it => new GetSettlementTasksQueryResultItem
+ {
+ Id = it.Id,
+ Name = it.Name,
+ Code = it.Code,
+ SettlementOrderStatus = it.SettlementOrderStatus,
+ SettlementOrderName = it.SettlementOrderName,
+ SettlementOrderTime = it.SettlementOrderTime,
+ ActualSettlementAmount = it.ActualSettlementAmount,
+ SettlementAmount = it.SettlementAmount,
+ SettlementStatus = it.SettlementStatus,
+ SettlementTime = it.SettlementTime,
+ SettlementRemark = it.SettlementRemark,
+ SettlementUserCount = it.SettlementUserCount
+ });
+ return await request.PageModel.GetPagedListAsync<GetSettlementTasksQueryResult, GetSettlementTasksQueryResultItem>(s, cancellationToken);
+ }
+
+ /// <summary>
+ /// 鏌ヨ缁撶畻鍗曡鎯�
+ /// </summary>
+ /// <param name="request"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public Task<GetSettlementTaskQueryResult> Handle(GetSettlementTaskQuery request, CancellationToken cancellationToken)
+ {
+ var logier = JwtUtils.GetCurrentLogier();
+ var model = TaskInfoRepository.GetQueryable(rep, true, logier)
+ .Where(it => it.Id == request.Id)
+ .GetDetail<TaskInfo, GetSettlementTaskQueryResult>();
+ return model;
+ }
+
+ /// <summary>
+ /// 鏌ヨ浠诲姟閫夋嫨鍣ㄦ暟鎹�
+ /// </summary>
+ /// <param name="request"></param>
+ /// <param name="cancellationToken"></param>
+ /// <returns></returns>
+ public async Task<List<SelectOption<Guid, GetTaskSelectQueryOption>>> Handle(GetTaskSelectQuery request, CancellationToken cancellationToken)
+ {
+ return await request.GetSelect<TaskInfo, Guid, GetTaskSelectQueryOption>(
+ it => it.Id,
+ it => it.Name,
+ q =>
+ {
+ q = TaskInfoRepository.GetQueryable(rep, true);
+ if (request.Keywords.IsNotNull())
+ {
+ q = q.Where(it =>
+ it.Code.Contains(request.Keywords)
+ || it.Name.Contains(request.Keywords));
+ }
+ return q;
+ },
+ cancellationToken);
+ }
}
}
--
Gitblit v1.9.1