From 1dd42ed5a57487c52a05954bc94f663d7e12981c Mon Sep 17 00:00:00 2001
From: sunpengfei <i@angelzzz.com>
Date: 星期四, 14 八月 2025 10:37:10 +0800
Subject: [PATCH] feat:开发
---
FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs | 23 +++++++++--
FlexJobApi.Core/FlexJobApi.Core.xml | 25 ++----------
FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs | 10 +++++
FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs | 28 +-------------
4 files changed, 35 insertions(+), 51 deletions(-)
diff --git a/FlexJobApi.Core/FlexJobApi.Core.xml b/FlexJobApi.Core/FlexJobApi.Core.xml
index 96c374a..5b12d21 100644
--- a/FlexJobApi.Core/FlexJobApi.Core.xml
+++ b/FlexJobApi.Core/FlexJobApi.Core.xml
@@ -4190,6 +4190,11 @@
浠诲姟浜哄憳Id
</summary>
</member>
+ <member name="P:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQuery.TaskInfoId">
+ <summary>
+ 浠诲姟Id
+ </summary>
+ </member>
<member name="T:FlexJobApi.Core.GetCheckReceiveTaskUserSubmitsQueryResult">
<summary>
鏌ヨ楠屾敹璇︽儏-缁撴灉
@@ -8040,26 +8045,6 @@
</summary>
</member>
<member name="P:FlexJobApi.Core.GetUserResumeQueryResultExperience.Name">
- <summary>
- 浠诲姟鍚嶇О
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetUserResumeQueryResultExperience.TaskInfo">
- <summary>
- 浠诲姟
- </summary>
- </member>
- <member name="T:FlexJobApi.Core.GetUserResumeQueryResultTaskInfo">
- <summary>
- 鏌ヨ鐢ㄦ埛绠�鍘�-缁撴灉-缁忓巻
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetUserResumeQueryResultTaskInfo.Enterprise">
- <summary>
- 浼佷笟
- </summary>
- </member>
- <member name="P:FlexJobApi.Core.GetUserResumeQueryResultTaskInfo.Name">
<summary>
浠诲姟鍚嶇О
</summary>
diff --git a/FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs b/FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs
index 2547c4c..6b2d603 100644
--- a/FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs
+++ b/FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs
@@ -189,6 +189,7 @@
/// <summary>
/// 缁忓巻
/// </summary>
+ [AdaptIgnore]
public List<GetUserResumeQueryResultExperience> TaskInfoUsers { get; set; }
/// <summary>
@@ -293,37 +294,12 @@
/// <summary>
/// 浼佷笟鍏ㄧО
/// </summary>
- [AdaptIgnore]
- public string EnterpriseName => TaskInfo.Enterprise.EnterpriseName;
-
- /// <summary>
- /// 浠诲姟鍚嶇О
- /// </summary>
- [AdaptIgnore]
- public string Name => TaskInfo.Name;
-
- /// <summary>
- /// 浠诲姟
- /// </summary>
- [JsonIgnore, SwaggerIgnore]
- public GetUserResumeQueryResultTaskInfo TaskInfo { get; set; }
- }
-
- /// <summary>
- /// 鏌ヨ鐢ㄦ埛绠�鍘�-缁撴灉-缁忓巻
- /// </summary>
- public class GetUserResumeQueryResultTaskInfo
- {
- /// <summary>
- /// 浼佷笟
- /// </summary>
- public GetUserResumeQueryResultTaskInfoEnterprise Enterprise { get; set; }
+ public string EnterpriseName { get; set; }
/// <summary>
/// 浠诲姟鍚嶇О
/// </summary>
public string Name { get; set; }
-
}
/// <summary>
diff --git a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
index 59f175d..4e5ba76 100644
--- a/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
+++ b/FlexJobApi.FlexJobServer.Application/TaskCheckReceives/Queries/TaskCheckReceiveQueryHandler.cs
@@ -220,11 +220,24 @@
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()
- .AnyAsync(it => it.UserId == result.ObjectData.EnterpriseEmployeeUser.Id);
+ if (request.Id.HasValue)
+ {
+ result.ObjectData = await repTaskInfoUser.AsQueryable().AsNoTracking()
+ .Where(it => it.Id == request.Id)
+ .GetDetail<TaskInfoUser, GetCheckReceiveTaskUserSubmitsQueryResultObjectData>();
+ }
+ else if (request.TaskInfoId.HasValue)
+ {
+ result.ObjectData = await repTaskInfoUser.AsQueryable().AsNoTracking()
+ .Where(it => it.TaskInfoId == request.TaskInfoId)
+ .GetDetail<TaskInfoUser, GetCheckReceiveTaskUserSubmitsQueryResultObjectData>();
+ }
+ if (result.ObjectData != null)
+ {
+ result.ObjectData.EnterpriseEmployeeUser.IsBindBankCard = await repTaskInfo.Change<UserBankCard>()
+ .AsQueryable().AsNoTracking()
+ .AnyAsync(it => it.UserId == result.ObjectData.EnterpriseEmployeeUser.Id);
+ }
return result;
}
diff --git a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
index 995e92e..cae6953 100644
--- a/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
+++ b/FlexJobApi.UserServer.Application/UserResumes/Queries/UserResumeQueryHandler.cs
@@ -145,9 +145,19 @@
};
}
if (model == null) throw Oops.Oh(EnumErrorCodeType.s404, "璇ヤ俊鎭�");
+
model.TaskInfoUsers = model.TaskInfoUsers.Where(it => it.SignContractTime.HasValue).ToList();
if (model.Id.HasValue)
{
+ model.TaskInfoUsers = rep.Change<TaskInfoUser>().AsQueryable().AsNoTracking()
+ .Where(it => it.EnterpriseEmployee.UserId == model.Id && it.EnterpriseEmployee.EnterpriseSignContractTime.HasValue)
+ .Select(it => new GetUserResumeQueryResultExperience
+ {
+ SignContractTime = it.EnterpriseEmployee.EnterpriseSignContractTime,
+ EnterpriseName = it.TaskInfo.Enterprise.EnterpriseName,
+ Name = it.TaskInfo.Name
+ })
+ .ToList();
model.TaskCount = await rep.Change<TaskInfoUser>().AsQueryable().AsNoTracking()
.Where(it => it.EnterpriseEmployee.UserId == model.Id && it.EnterpriseEmployee.HireStatus == EnumTaskUserHireStatus.Pass)
.CountAsync();
--
Gitblit v1.9.1