From 567b608568271d9fc6a5030187af97cd3a91ad87 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 14 八月 2025 16:21:03 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 77 ++++++++++++++++++++++++++++++++------
1 files changed, 65 insertions(+), 12 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
index 9e3e283..161ca2f 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -43,11 +43,15 @@
if (logier.Type == EnumUserType.Personal)
{
- q = q.Where(it => it.TaskInfoUsers.Any(tu => tu.EnterpriseEmployee.UserId == logier.Id));
+ q = q.Where(it => it.TaskInfoUsers.Any(tu =>
+ tu.EnterpriseEmployee.UserId == logier.Id
+ && tu.ArrangeStatus == EnumTaskUserArrangeStatus.Complete));
}
else if (logier.Type == EnumUserType.Enterprise)
{
- q = q.Where(it => it.EnterpriseId == logier.EnterpriseId);
+ q = q.Where(it =>
+ it.EnterpriseId == logier.EnterpriseId
+ && it.Status == EnumTaskStatus.Complete);
}
if (request.Keywords.IsNotNull())
{
@@ -69,6 +73,7 @@
}
q = q.Where(it =>
(logier.Type == EnumUserType.Enterprise ? it.EnterpriseId == logier.EnterpriseId : true)
+ && it.BeginTime.Date <= request.Date.Value && request.Date.Value <= it.EndTime.Date
&& it.TaskInfoUsers.Any(tu =>
(logier.Type == EnumUserType.Personal ? tu.EnterpriseEmployee.UserId == logier.Id : true)
&& (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit
@@ -93,7 +98,23 @@
q = q.Where(it => it.CheckReceiveStatus == request.CheckReceiveStatus);
}
}
- var s = q.ProjectToType<GetCheckReceiveTasksQueryResultItem>();
+ var s = q.Select(it => new GetCheckReceiveTasksQueryResultItem
+ {
+ Id = it.Id,
+ Name = it.Name,
+ Code = it.Code,
+ BillingMethod = it.BillingMethod,
+ ServiceFee = it.ServiceFee,
+ SettlementCycle = it.SettlementCycle,
+ CreatedTime = it.CreatedTime,
+ BeginTime = it.BeginTime,
+ EndTime = it.EndTime,
+ AddressName = it.AddressName,
+ LastCheckReceiveTime = it.LastCheckReceiveTime,
+ CheckReceiveStatus = logier.Type == EnumUserType.Enterprise && logier.ClientType == EnumClientType.Wxmp && request.Date.HasValue
+ ? request.CheckReceiveStatus
+ : it.CheckReceiveStatus,
+ });
return await request.PageModel.GetPagedListAsync<GetCheckReceiveTasksQueryResult, GetCheckReceiveTasksQueryResultItem>(s, cancellationToken);
}
@@ -154,13 +175,22 @@
ContactPhoneNumber = it.EnterpriseEmployee.User.ContactPhoneNumber,
IsReal = it.EnterpriseEmployee.User.IsReal,
RealMethod = it.EnterpriseEmployee.User.RealMethod,
- CheckReceiveStatus = it.CheckReceiveStatus,
+ CheckReceiveStatus = logier.Type == EnumUserType.Enterprise && logier.ClientType == EnumClientType.Wxmp && request.Date.HasValue
+ ? it.Submits
+ .Where(s => s.Date == request.Date)
+ .Select(s => (s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit
+ ? EnumTaskCheckReceiveStatus.WaitSubmit
+ : s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitCheckReceive
+ ? EnumTaskCheckReceiveStatus.WaitCheckReceive
+ : EnumTaskCheckReceiveStatus.Completed) as EnumTaskCheckReceiveStatus?)
+ .FirstOrDefault() ?? EnumTaskCheckReceiveStatus.WaitSubmit
+ : it.CheckReceiveStatus,
LastSubmitTime = it.LastSubmitTime,
});
var result = await request.PageModel.GetPagedListAsync<GetCheckReceiveTaskQueryResult, GetCheckReceiveTaskQueryResultItem>(s, cancellationToken);
result.ObjectData = await repTaskInfo.AsQueryable().AsNoTracking()
- .Where(it => it.Id == request.TaskInfoId)
- .GetDetail<TaskInfo, GetCheckReceiveTaskQueryResultObjectData>();
+ .Where(it => it.Id == request.TaskInfoId)
+ .GetDetail<TaskInfo, GetCheckReceiveTaskQueryResultObjectData>();
return result;
}
@@ -175,7 +205,17 @@
var logier = JwtUtils.GetCurrentLogier();
var q = repTaskInfoUserSubmit.AsQueryable().AsNoTracking()
.OrderByDescending(it => it.CreatedTime)
- .Where(it => it.TaskInfoUserId == request.Id);
+ .AsQueryable();
+ if (logier.Type == EnumUserType.Personal)
+ {
+ if (request.TaskInfoId == null) throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨浠诲姟");
+ q = q.Where(it => it.TaskInfoUser.TaskInfoId == request.TaskInfoId && it.TaskInfoUser.EnterpriseEmployee.UserId == logier.Id);
+ }
+ else
+ {
+ if (request.Id == null) throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨鐏靛伐");
+ q = q.Where(it => it.TaskInfoUserId == request.Id);
+ }
var s = q.Select(it => new GetCheckReceiveTaskUserSubmitsQueryResultItem
{
Id = it.Id,
@@ -185,11 +225,24 @@
CheckReceiveTime = it.CheckReceiveTime,
});
var result = await request.PageModel.GetPagedListAsync<GetCheckReceiveTaskUserSubmitsQueryResult, GetCheckReceiveTaskUserSubmitsQueryResultItem>(s, cancellationToken);
- result.ObjectData = await repTaskInfoUser.AsQueryable().AsNoTracking()
- .Where(it => it.Id == request.Id)
- .GetDetail<TaskInfoUser, GetCheckReceiveTaskUserSubmitsQueryResultObjectData>();
- result.ObjectData.EnterpriseEmployeeUser.IsBindBankCard = await repTaskInfo.Change<UserBankCard>().AsQueryable().AsNoTracking()
- .AnyAsync(it => it.UserId == result.ObjectData.EnterpriseEmployeeUser.Id);
+ if (request.Id.HasValue)
+ {
+ result.ObjectData = await repTaskInfoUser.AsQueryable().AsNoTracking()
+ .Where(it => it.Id == request.Id)
+ .GetDetail<TaskInfoUser, GetCheckReceiveTaskUserSubmitsQueryResultObjectData>();
+ }
+ else if (request.TaskInfoId.HasValue)
+ {
+ result.ObjectData = await repTaskInfoUser.AsQueryable().AsNoTracking()
+ .Where(it => it.TaskInfoId == request.TaskInfoId)
+ .GetDetail<TaskInfoUser, GetCheckReceiveTaskUserSubmitsQueryResultObjectData>();
+ }
+ if (result.ObjectData != null)
+ {
+ result.ObjectData.EnterpriseEmployeeUser.IsBindBankCard = await repTaskInfo.Change<UserBankCard>()
+ .AsQueryable().AsNoTracking()
+ .AnyAsync(it => it.UserId == result.ObjectData.EnterpriseEmployeeUser.Id);
+ }
return result;
}
--
Gitblit v1.9.1