From 5c45bc53e2c18e45130c21048df4af4896455c6d Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 12 九月 2025 15:58:48 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 103 +++++++++++++++++++++++++++++++++------------------
1 files changed, 67 insertions(+), 36 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
index 9fdf689..4185b37 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -42,9 +42,8 @@
{
var now = DateTime.Now;
var logier = JwtUtils.GetCurrentLogier();
- var q = repTaskInfo.AsQueryable().AsNoTracking()
- .OrderBy(it => it.CreatedTime)
- .Where(it => it.BeginTime <= now.Date && now.Date <= it.EndTime);
+ IQueryable<TaskInfo> q = repTaskInfo.AsQueryable().AsNoTracking()
+ .OrderBy(it => it.CreatedTime);
if (logier.Type == EnumUserType.Personal)
{
@@ -82,7 +81,8 @@
&& it.TaskInfoUsers.Any(tu =>
(logier.Type == EnumUserType.Personal ? tu.EnterpriseEmployee.UserId == logier.Id : true)
&& (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit
- ? !tu.Submits.Any(s => s.Date.Date == request.Date.Value.Date)
+ ? (!tu.Submits.Any(s => s.Date.Date == request.Date.Value.Date)
+ || tu.Submits.Any(s => s.Date.Date == request.Date.Value.Date && s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit))
: tu.Submits.Any(s =>
s.Date.Date == request.Date.Value.Date
&& (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit
@@ -134,7 +134,7 @@
var logier = JwtUtils.GetCurrentLogier();
var q = repTaskInfoUser.AsQueryable().AsNoTracking()
.OrderBy(it => it.CreatedTime)
- .Where(it => it.TaskInfoId == request.TaskInfoId);
+ .Where(it => it.TaskInfoId == request.TaskInfoId && it.ArrangeStatus == EnumTaskUserArrangeStatus.Complete);
if (logier.Type == EnumUserType.Personal)
{
@@ -157,7 +157,8 @@
q = q.Where(it =>
it.TaskInfo.EnterpriseId == logier.EnterpriseId
&& (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit
- ? !it.Submits.Any(s => s.Date.Date == request.Date.Value.Date)
+ ? (!it.Submits.Any(s => s.Date.Date == request.Date.Value.Date)
+ || it.Submits.Any(s => s.Date.Date == request.Date.Value.Date && s.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit))
: it.Submits.Any(s =>
s.Date.Date == request.Date.Value.Date
&& (request.CheckReceiveStatus == EnumTaskCheckReceiveStatus.WaitSubmit
@@ -205,50 +206,75 @@
/// <param name="request"></param>
/// <param name="cancellationToken"></param>
/// <returns></returns>
+ [UnitOfWork(false)]
public async Task<GetCheckReceiveTaskUserSubmitsQueryResult> Handle(GetCheckReceiveTaskUserSubmitsQuery request, CancellationToken cancellationToken)
{
var logier = JwtUtils.GetCurrentLogier();
- var q = repTaskInfoUserSubmit.AsQueryable().AsNoTracking()
- .OrderByDescending(it => it.CreatedTime)
- .AsQueryable();
+ TaskInfoUser? taskUser = null;
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);
+ if (request.TaskInfoId == null) throw Oops.Oh(EnumErrorCodeType.s404, "浠诲姟");
+ taskUser = await repTaskInfoUser.AsQueryable()
+ .Include(it => it.TaskInfo)
+ .Include(it => it.EnterpriseEmployee).ThenInclude(it => it.User)
+ .Where(it =>
+ it.TaskInfoId == request.TaskInfoId
+ && it.EnterpriseEmployee.UserId == logier.Id)
+ .FirstOrDefaultAsync();
}
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,
- Date = it.Date,
- CreatedTime = it.CreatedTime,
- Files = it.Files.Select(f => f.File).ToList(),
- CheckReceiveStatus = it.CheckReceiveStatus,
- CheckReceiveTime = it.CheckReceiveTime,
- });
- var result = await request.PageModel.GetPagedListAsync<GetCheckReceiveTaskUserSubmitsQueryResult, GetCheckReceiveTaskUserSubmitsQueryResultItem>(s, cancellationToken);
- if (request.Id.HasValue)
- {
- result.ObjectData = await repTaskInfoUser.AsQueryable().AsNoTracking()
+ taskUser = await repTaskInfoUser.AsQueryable()
+ .Include(it => it.TaskInfo)
+ .Include(it => it.EnterpriseEmployee).ThenInclude(it => it.User)
.Where(it => it.Id == request.Id)
- .GetDetail<TaskInfoUser, GetCheckReceiveTaskUserSubmitsQueryResultObjectData>();
+ .FirstOrDefaultAsync();
}
- else if (request.TaskInfoId.HasValue)
+ if (taskUser == null) throw Oops.Oh(EnumErrorCodeType.s404, "浠诲姟");
+ var q = repTaskInfoUserSubmit.AsQueryable().AsNoTracking()
+ .Include(it => it.Files)
+ .OrderByDescending(it => it.Date)
+ .Where(it => it.TaskInfoUserId == taskUser.Id);
+ var dates = await q
+ .Select(it => it.Date)
+ .ToListAsync();
+ for (DateTime i = taskUser.TaskInfo.BeginTime.Date; i <= taskUser.TaskInfo.EndTime.Date; i = i.AddDays(1))
{
- result.ObjectData = await repTaskInfoUser.AsQueryable().AsNoTracking()
- .Where(it => it.TaskInfoId == request.TaskInfoId)
- .GetDetail<TaskInfoUser, GetCheckReceiveTaskUserSubmitsQueryResultObjectData>();
+ if (!dates.Contains(i))
+ {
+ var entity = new TaskInfoUserSubmit
+ {
+ TaskInfoUserId = taskUser.Id,
+ Date = i,
+ CheckReceiveStatus = EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit
+ };
+ await repTaskInfoUserSubmit.InsertNowAsync(entity);
+ }
}
- if (result.ObjectData != null)
+
+ var s = q
+ .Select(it => new GetCheckReceiveTaskUserSubmitsQueryResultItem
+ {
+ Id = it.Id,
+ Date = it.Date,
+ CreatedTime = it.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit
+ ? null
+ : it.CreatedTime,
+ Files = it.Files.Select(f => f.File).ToList(),
+ CheckReceiveStatus = it.CheckReceiveStatus,
+ CheckReceiveTime = it.CheckReceiveTime,
+ });
+ var result = await request.PageModel.GetPagedListAsync<GetCheckReceiveTaskUserSubmitsQueryResult, GetCheckReceiveTaskUserSubmitsQueryResultItem>(s, cancellationToken);
+
+ result.ObjectData = new GetCheckReceiveTaskUserSubmitsQueryResultObjectData
{
- result.ObjectData.EnterpriseEmployeeUser.IsBindBankCard = await repTaskInfo.Change<UserBankCard>()
- .AsQueryable().AsNoTracking()
- .AnyAsync(it => it.UserId == result.ObjectData.EnterpriseEmployeeUser.Id);
- }
+ EnterpriseEmployeeUser = taskUser.EnterpriseEmployee.User.Adapt<GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser>(),
+ TaskInfo = taskUser.TaskInfo.Adapt<GetCheckReceiveTaskUserSubmitsQueryResultObjectDataTaskInfo>()
+ };
+ result.ObjectData.EnterpriseEmployeeUser.IsBindBankCard = await repTaskInfo.Change<UserBankCard>()
+ .AsQueryable().AsNoTracking()
+ .AnyAsync(it => it.UserId == result.ObjectData.EnterpriseEmployeeUser.Id);
return result;
}
@@ -326,7 +352,12 @@
Id = entity.Id,
Date = entity.Date,
CreatedTime = entity.CreatedTime,
+ CheckReceiveStatus = entity.CheckReceiveStatus,
};
+ if (model.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit)
+ {
+ model.CreatedTime = null;
+ }
model.TaskInfoUserEnterpriseEmployeeUser = await repUser.AsQueryable().AsNoTracking()
.Where(it => it.EnterpriseEmployees.Any(ee => ee.TaskInfoUsers.Any(tu => tu.Id == entity.TaskInfoUserId)))
.ProjectToType<GetCheckReceiveTaskUserSubmitsQueryResultObjectDataEnterpriseEmployeeUser>()
--
Gitblit v1.9.1