From e057ae677549a83cc8c502bfe4f835cf6991d653 Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 14 八月 2025 16:13:00 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Commands/SubmitCheckReceiveTaskCommand.cs | 5 +++++
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Commands/TaskCheckReceiveCommandHandler.cs | 9 ++++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Commands/SubmitCheckReceiveTaskCommand.cs b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Commands/SubmitCheckReceiveTaskCommand.cs
index 5b846e3..ec27d9e 100644
--- a/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Commands/SubmitCheckReceiveTaskCommand.cs
+++ b/FlexJobApi.Core/Models/FlexJobServer/TaskCheckReceive/Commands/SubmitCheckReceiveTaskCommand.cs
@@ -24,6 +24,11 @@
public Guid TaskInfoId { get; set; }
/// <summary>
+ /// 鏃ユ湡
+ /// </summary>
+ public DateTime Date { get; set; }
+
+ /// <summary>
/// 闄勪欢
/// </summary>
public List<string> Files { get; set; }
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Commands/TaskCheckReceiveCommandHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Commands/TaskCheckReceiveCommandHandler.cs
index a7740a3..9b802f4 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Commands/TaskCheckReceiveCommandHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Commands/TaskCheckReceiveCommandHandler.cs
@@ -43,7 +43,8 @@
if (task == null) throw Oops.Oh(EnumErrorCodeType.s404, "璇ヤ换鍔�");
if (task.Status != EnumTaskStatus.Complete) throw Oops.Oh(EnumErrorCodeType.s510, "璇ヤ换鍔℃殏鏈畨鎺掍汉鍛�");
if (task.ReleaseStatus != EnumTaskReleaseStatus.InProcess) throw Oops.Oh(EnumErrorCodeType.s510, "璇ヤ换鍔″凡缁撴潫");
- if (!(task.BeginTime <= now && now <= task.EndTime)) throw Oops.Oh(EnumErrorCodeType.s510, "璇ヤ换鍔″凡缁撴潫");
+ if (!(task.BeginTime <= request.Date.Date && request.Date.Date <= task.EndTime))
+ throw Oops.Oh(EnumErrorCodeType.s510, "璇ヤ换鍔″凡缁撴潫");
var taskUser = await repTaskInfoUser.AsQueryable()
.FirstOrDefaultAsync(it => it.TaskInfoId == task.Id && it.EnterpriseEmployee.UserId == logier.Id, cancellationToken);
if (taskUser == null) throw Oops.Oh(EnumErrorCodeType.s404, "璇ユ姤鍚嶄俊鎭�");
@@ -61,7 +62,7 @@
submit = new TaskInfoUserSubmit
{
TaskInfoUserId = taskUser.Id,
- Date = now.Date,
+ Date = request.Date,
Files = request.Files.Select(it => new TaskInfoUserSubmitFile
{
File = it
@@ -113,8 +114,6 @@
.FirstOrDefaultAsync(it => it.Id == taskUser.TaskInfoId && it.EnterpriseId == logier.EnterpriseId, cancellationToken);
if (task == null) throw Oops.Oh(EnumErrorCodeType.s404, "璇ヤ换鍔�");
if (task.Status != EnumTaskStatus.Complete) throw Oops.Oh(EnumErrorCodeType.s510, "璇ヤ换鍔℃殏鏈畨鎺掍汉鍛�");
- if (task.ReleaseStatus != EnumTaskReleaseStatus.InProcess) throw Oops.Oh(EnumErrorCodeType.s510, "璇ヤ换鍔″凡缁撴潫");
- if (!(task.BeginTime <= now && now <= task.EndTime)) throw Oops.Oh(EnumErrorCodeType.s510, "璇ヤ换鍔″凡缁撴潫");
if (request.CheckReceiveStatus != EnumTaskUserSubmitCheckReceiveStatus.Success
&& request.CheckReceiveStatus != EnumTaskUserSubmitCheckReceiveStatus.Fail)
throw Oops.Oh(EnumErrorCodeType.s400, "璇烽�夋嫨姝ｇ‘鐨勯獙鏀剁姸鎬�");
@@ -136,7 +135,7 @@
|| it.CheckReceiveStatus == EnumTaskUserSubmitCheckReceiveStatus.Fail))
.Select(it => it.Date)
.ToListAsync();
- taskUserSubmitDates.Add(now.Date);
+ taskUserSubmitDates.Add(submit.Date);
if (dates.All(taskUserSubmitDates.Contains))
{
taskUser.CheckReceiveStatus = EnumTaskCheckReceiveStatus.Completed;
--
Gitblit v1.9.1