From 6abe988bee26f64b610e427b8795b6fd36a549ec Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期五, 15 八月 2025 15:46:08 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 3 ++-
FlexJobApi.Core/FlexJobApi.Core.xml | 45 +++++++++++++++------------------------------
FlexJobApi.Core/Jobs/CalcTaskSatusByDateJob.cs | 1 -
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Commands/TaskCheckReceiveCommandHandler.cs | 2 ++
FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs | 2 +-
5 files changed, 20 insertions(+), 33 deletions(-)
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index e538be6..5081d9f 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -4891,6 +4891,11 @@
鎴戠殑宸插綍鐢ㄥ垎椤靛垪琛�-鐘舵��
</summary>
</member>
+ <member name="F:FlexJobApi.Core.GetPersonalHireTaskInfosQueryStatus.Wait">
+ <summary>
+ 寰呭紑濮�
+ </summary>
+ </member>
<member name="F:FlexJobApi.Core.GetPersonalHireTaskInfosQueryStatus.InProcess">
<summary>
杩涜涓�
@@ -5099,6 +5104,11 @@
<member name="T:FlexJobApi.Core.GetTaskInfoQueryResultHireButton">
<summary>
鎴戠殑褰曠敤鍒楄〃-璇︽儏-鎸夐挳绫诲瀷
+ </summary>
+ </member>
+ <member name="F:FlexJobApi.Core.GetTaskInfoQueryResultHireButton.Wait">
+ <summary>
+ 寰呭紑濮�
</summary>
</member>
<member name="F:FlexJobApi.Core.GetTaskInfoQueryResultHireButton.ApplyCheckReceive">
@@ -5374,6 +5384,11 @@
<member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.RecommendStatus">
<summary>
鎺ㄨ崘鐘舵��
+ </summary>
+ </member>
+ <member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.HireStatus">
+ <summary>
+ 褰曠敤鐘舵��
</summary>
</member>
<member name="P:FlexJobApi.Core.GetTaskInfosQueryResultItem.CreatedTime">
@@ -8632,36 +8647,6 @@
<member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterprise.CityCode">
<summary>
鎵�鍦ㄥ煄甯傜紪鍙�
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterprise.IndustryTypeCode">
- <summary>
- 鎵�灞炶涓氱紪鍙�
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterprise.EnterpriseType">
- <summary>
- 浼佷笟绫诲瀷
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterprise.RegisteredCapital">
- <summary>
- 娉ㄥ唽璧勬湰
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterprise.EstablishmentDate">
- <summary>
- 鎴愮珛鏃ユ湡
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterprise.Address">
- <summary>
- 浼佷笟鍦板潃
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterprise.MainBusiness">
- <summary>
- 缁忚惀鑼冨洿
</summary>
</member>
<member name="P:FlexJobApi.Core.SyncEnterpriseUserCommandEnterprise.Contacts">
diff --git a/FlexJobApi.Core/Jobs/CalcTaskSatusByDateJob.cs b/FlexJobApi.Core/Jobs/CalcTaskSatusByDateJob.cs
index 3341804..772395e 100644
--- a/FlexJobApi.Core/Jobs/CalcTaskSatusByDateJob.cs
+++ b/FlexJobApi.Core/Jobs/CalcTaskSatusByDateJob.cs
@@ -31,7 +31,6 @@
{
entity.ReleaseStatus = EnumTaskReleaseStatus.Stopped;
}
- await rep.UpdateAsync(entities);
}
}
}
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Commands/TaskCheckReceiveCommandHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Commands/TaskCheckReceiveCommandHandler.cs
index f706f34..406a0b7 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Commands/TaskCheckReceiveCommandHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Commands/TaskCheckReceiveCommandHandler.cs
@@ -43,6 +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 (request.Date.Date > now.Date)
+ throw Oops.Oh(EnumErrorCodeType.s510, "浠诲姟鏃堕棿鏈紑濮�");
if (task.BeginTime > request.Date.Date)
throw Oops.Oh(EnumErrorCodeType.s510, "浠诲姟鏈紑濮�");
if (request.Date.Date > task.EndTime)
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
index 161ca2f..2c81f53 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -36,10 +36,11 @@
/// <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();
+ .Where(it => it.BeginTime <= now.Date && now.Date <= it.EndTime);
if (logier.Type == EnumUserType.Personal)
{
diff --git a/FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs b/FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs
index 0d67047..c0372c9 100644
--- a/FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/Tasks/Commands/TaskInfoCommandHandler.cs
@@ -124,7 +124,7 @@
q =>
{
q = TaskInfoRepository.GetQueryable(rep, false);
- if (q.AsNoTracking().Any(it => it.Status == EnumTaskStatus.Complete))
+ if (q.AsNoTracking().Any(it => request.Ids.Contains(it.Id) && it.Status == EnumTaskStatus.Complete))
{
throw Oops.Oh(EnumErrorCodeType.s510, "宸插畨鎺掔殑浠诲姟鏃犳硶鍒犻櫎");
}
--
Gitblit v1.9.1