From 5b86cd10f893872da68c040adea52953eb25c4a0 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期二, 09 九月 2025 15:08:22 +0800 Subject: [PATCH] feat:开发 --- FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 71 +++++++++++++++++++++++++++++++++-- 1 files changed, 66 insertions(+), 5 deletions(-) diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs index 32fea4c..9fdf689 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>, @@ -256,20 +260,77 @@ /// <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, + }; + 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