From 423abcb9d7af20b0d18a49cc4f13167f4b64107f Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 11 九月 2025 14:19:00 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 203 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 174 insertions(+), 29 deletions(-)
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
index 9e3e283..74e3c39 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -1,5 +1,7 @@
-锘縰sing FlexJobApi.Core;
+锘縰sing Aop.Api.Domain;
+using FlexJobApi.Core;
using Furion.DatabaseAccessor;
+using Furion.DistributedIDGenerator;
using Furion.FriendlyException;
using Mapster;
using MediatR;
@@ -9,6 +11,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using TaskInfo = FlexJobApi.Core.TaskInfo;
namespace FlexJobApi.FlexJobServer.Application
{
@@ -18,6 +21,7 @@
public class TaskCheckReceiveQueryHandler(
IRepository<TaskInfo> repTaskInfo,
IRepository<TaskInfoUser> repTaskInfoUser,
+ IRepository<User> repUser,
IRepository<TaskInfoUserSubmit> repTaskInfoUserSubmit) :
IRequestHandler<GetCheckReceiveTasksQuery, GetCheckReceiveTasksQueryResult>,
IRequestHandler<GetCheckReceiveTaskQuery, GetCheckReceiveTaskQueryResult>,
@@ -36,18 +40,22 @@
/// <returns></returns>
public async Task<GetCheckReceiveTasksQueryResult> Handle(GetCheckReceiveTasksQuery request, CancellationToken cancellationToken)
{
+ var now = DateTime.Now;
var logier = JwtUtils.GetCurrentLogier();
- var q = repTaskInfo.AsQueryable().AsNoTracking()
- .OrderBy(it => it.CreatedTime)
- .AsQueryable();
+ IQueryable<TaskInfo> q = repTaskInfo.AsQueryable().AsNoTracking()
+ .OrderBy(it => it.CreatedTime);
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 +77,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 +102,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);
}
@@ -108,7 +133,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)
{
@@ -154,13 +179,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;
}
@@ -170,25 +204,74 @@
/// <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)
- .Where(it => it.TaskInfoUserId == request.Id);
- var s = q.Select(it => new GetCheckReceiveTaskUserSubmitsQueryResultItem
+ TaskInfoUser? taskUser = null;
+ if (logier.Type == EnumUserType.Personal)
{
- Id = it.Id,
- CreatedTime = it.CreatedTime,
- Files = it.Files.Select(f => f.File).ToList(),
- CheckReceiveStatus = it.CheckReceiveStatus,
- CheckReceiveTime = it.CheckReceiveTime,
- });
+ 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, "璇烽�夋嫨鐏靛伐");
+ taskUser = await repTaskInfoUser.AsQueryable()
+ .Include(it => it.TaskInfo)
+ .Include(it => it.EnterpriseEmployee).ThenInclude(it => it.User)
+ .Where(it => it.Id == request.Id)
+ .FirstOrDefaultAsync();
+ }
+ 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))
+ {
+ if (!dates.Contains(i))
+ {
+ var entity = new TaskInfoUserSubmit
+ {
+ TaskInfoUserId = taskUser.Id,
+ Date = i,
+ CheckReceiveStatus = EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit
+ };
+ await repTaskInfoUserSubmit.InsertNowAsync(entity);
+ }
+ }
+
+ 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 = await repTaskInfoUser.AsQueryable().AsNoTracking()
- .Where(it => it.Id == request.Id)
- .GetDetail<TaskInfoUser, GetCheckReceiveTaskUserSubmitsQueryResultObjectData>();
- result.ObjectData.EnterpriseEmployeeUser.IsBindBankCard = await repTaskInfo.Change<UserBankCard>().AsQueryable().AsNoTracking()
+
+ result.ObjectData = new GetCheckReceiveTaskUserSubmitsQueryResultObjectData
+ {
+ 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;
}
@@ -201,20 +284,82 @@
/// <returns></returns>
public async Task<GetCheckReceiveTaskUserSubmitQueryResult> Handle(GetCheckReceiveTaskUserSubmitQuery request, CancellationToken cancellationToken)
{
- var q = repTaskInfoUserSubmit.AsQueryable().AsNoTracking();
+ var logier = JwtUtils.GetCurrentLogier();
+ TaskInfoUserSubmit? entity = null;
+ var q = repTaskInfoUserSubmit.AsQueryable();
if (request.SubmitId.HasValue)
{
q = q.Where(it => it.Id == request.SubmitId.Value);
+ entity = await q.FirstOrDefaultAsync();
+ if (entity == null)
+ {
+ throw Oops.Oh(EnumErrorCodeType.s404, "鎻愪氦淇℃伅");
+ }
}
else if (request.Date.HasValue && request.TaskInfoId.HasValue)
{
- q = q.Where(it => it.Date.Date == request.Date.Value.Date && it.TaskInfoUser.TaskInfoId == request.TaskInfoId.Value);
+ var taskUser = await repTaskInfoUser.AsQueryable().AsNoTracking()
+ .Where(it =>
+ it.EnterpriseEmployee.UserId == logier.Id
+ && it.TaskInfoId == request.TaskInfoId)
+ .FirstOrDefaultAsync();
+ if (taskUser == null) throw Oops.Oh(EnumErrorCodeType.s404, "浠诲姟");
+ q = q.Where(it =>
+ it.Date.Date == request.Date.Value.Date
+ && it.TaskInfoUserId == taskUser.Id);
+ entity = await q.FirstOrDefaultAsync();
+ if (entity == null)
+ {
+ entity = new TaskInfoUserSubmit
+ {
+ Id = IDGen.NextID(),
+ TaskInfoUserId = taskUser.Id,
+ Date = request.Date.Value.Date,
+ CheckReceiveStatus = EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit,
+ CreatedTime = DateTime.Now
+ };
+ await repTaskInfoUserSubmit.InsertAsync(entity);
+ }
}
else if (request.Date.HasValue && request.TaskInfoUserId.HasValue)
{
- q = q.Where(it => it.Date.Date == request.Date.Value.Date && it.TaskInfoUserId == request.TaskInfoUserId.Value);
+ q = q.Where(it =>
+ it.Date.Date == request.Date.Value.Date
+ && it.TaskInfoUserId == request.TaskInfoUserId.Value);
+ entity = await q.FirstOrDefaultAsync();
+ if (entity == null)
+ {
+ entity = new TaskInfoUserSubmit
+ {
+ Id = IDGen.NextID(),
+ TaskInfoUserId = request.TaskInfoUserId.Value,
+ Date = request.Date.Value.Date,
+ CheckReceiveStatus = EnumTaskUserSubmitCheckReceiveStatus.WaitSubmit,
+ CreatedTime = DateTime.Now
+ };
+ await repTaskInfoUserSubmit.InsertAsync(entity);
+ }
}
- var model = await q.GetDetail<TaskInfoUserSubmit, GetCheckReceiveTaskUserSubmitQueryResult>();
+ if (entity == null)
+ {
+ throw Oops.Oh(EnumErrorCodeType.s404, "鎻愪氦淇℃伅");
+ }
+
+ var model = new GetCheckReceiveTaskUserSubmitQueryResult
+ {
+ 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>()
+ .FirstOrDefaultAsync();
model.Files = await repTaskInfoUserSubmit.Change<TaskInfoUserSubmitFile>().AsQueryable().AsNoTracking()
.Where(it => it.SubmitId == model.Id)
.Select(it => it.File)
--
Gitblit v1.9.1