From e9960b323c486a3d34275824fd9bd6259d1b5c20 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期五, 22 八月 2025 14:16:53 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/ApiFlexJob --- FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs | 50 ++++++++++++++++++-------------------------------- 1 files changed, 18 insertions(+), 32 deletions(-) diff --git a/FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs b/FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs index a52e72e..9c8ce5b 100644 --- a/FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs +++ b/FlexJobApi.Core/Models/UserServer/UserResumes/Queries/GetUserResumeQuery.cs @@ -14,13 +14,18 @@ /// <summary> /// 鏌ヨ鐢ㄦ埛绠�鍘� /// </summary> - [Resource([EnumResourceController.UserResume])] + [Resource([EnumResourceController.UserServerUserResume], AllowAnonymous = true)] public class GetUserResumeQuery : IRequest<GetUserResumeQueryResult> { /// <summary> /// 鐢ㄦ埛Id /// </summary> public Guid? UserId { get; set; } + + /// <summary> + /// 鐏靛伐Id + /// </summary> + public Guid? EnterpriseEmployeeId { get; set; } } /// <summary> @@ -39,7 +44,7 @@ /// <summary> /// 鐢ㄦ埛Id /// </summary> - public Guid Id { get; set; } + public Guid? Id { get; set; } /// <summary> /// 瀹屽杽搴� @@ -184,7 +189,13 @@ /// <summary> /// 缁忓巻 /// </summary> + [AdaptIgnore] public List<GetUserResumeQueryResultExperience> TaskInfoUsers { get; set; } + + /// <summary> + /// 鏄惁宸叉敹钘� + /// </summary> + public bool? IsCollected { get; set; } } /// <summary> @@ -236,12 +247,12 @@ /// <summary> /// 寮�濮嬫棩鏈� /// </summary> - public DateTime StartDate { get; set; } + public DateTime? StartDate { get; set; } /// <summary> /// 缁撴潫鏃ユ湡 /// </summary> - public DateTime EndDate { get; set; } + public DateTime? EndDate { get; set; } /// <summary> /// 鍙戣瘉鍗曚綅 @@ -276,44 +287,19 @@ public class GetUserResumeQueryResultExperience { /// <summary> - /// 绛剧害鏃堕棿 + /// 褰曠敤鏃堕棿 /// </summary> - public DateTime? SignContractTime { get; set; } + public DateTime? HireTime { get; set; } /// <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> -- Gitblit v1.9.1