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/Entities/FlexJobServer/Tasks/TaskInfoUser.cs | 84 +++++++++++++++++++++++++---------------- 1 files changed, 51 insertions(+), 33 deletions(-) diff --git a/FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfoUser.cs b/FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfoUser.cs index 2599559..e277a49 100644 --- a/FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfoUser.cs +++ b/FlexJobApi.Core/Entities/FlexJobServer/Tasks/TaskInfoUser.cs @@ -1,4 +1,7 @@ -锘縰sing System; +锘縰sing Furion.DatabaseAccessor; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Metadata.Builders; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -7,10 +10,15 @@ namespace FlexJobApi.Core { /// <summary> - /// 浠诲姟闆囦剑淇℃伅 + /// 浠诲姟浜哄憳淇℃伅 /// </summary> - public class TaskInfoUser : CommonEntity + public class TaskInfoUser : CommonEntity, IEntityTypeBuilder<TaskInfoUser> { + public TaskInfoUser() + { + Submits = []; + } + /// <summary> /// 浠诲姟Id /// </summary> @@ -22,14 +30,14 @@ public TaskInfo TaskInfo { get; set; } /// <summary> - /// 鐢ㄦ埛淇℃伅Id + /// 鐏靛伐Id /// </summary> - public Guid UserId { get; set; } + public Guid EnterpriseEmployeeId { get; set; } /// <summary> - /// 鐢ㄦ埛淇℃伅 + /// 鐏靛伐 /// </summary> - public User User { get; set; } + public EnterpriseEmployee EnterpriseEmployee { get; set; } /// <summary> /// 褰曠敤鐘舵�� @@ -42,38 +50,48 @@ public DateTime? HireTime { get; set; } /// <summary> - /// 鐏靛伐绛剧害鐘舵�� - /// </summary> - public EnumTaskUserSignContractStatus? UserSignContractStatus { get; set; } - - /// <summary> - /// 鐏靛伐绛剧害鏃堕棿 - /// </summary> - public DateTime? UserSignContractTime { get; set; } - - /// <summary> - /// 浼佷笟绛剧害鐘舵�� - /// </summary> - public EnumTaskUserSignContractStatus? EnterpriseSignContractStatus { get; set; } - - /// <summary> - /// 浼佷笟绛剧害鏃堕棿 - /// </summary> - public DateTime? EnterpriseSignContractTime { get; set; } - - /// <summary> - /// 鐢靛瓙鍚堝悓 - /// </summary> - public string ContractUrl { get; set; } - - /// <summary> /// 瀹夋帓鐘舵�� /// </summary> public EnumTaskUserArrangeStatus? ArrangeStatus { get; set; } /// <summary> - /// 瀹夋帓鐘舵�� + /// 瀹夋帓瀹屾垚鏃堕棿 /// </summary> public DateTime? ArrangeTime { get; set; } + + /// <summary> + /// 楠屾敹鐘舵�� + /// </summary> + public EnumTaskCheckReceiveStatus? CheckReceiveStatus { get; set; } + + /// <summary> + /// 楠屾敹瀹屾垚鏃堕棿 + /// </summary> + public DateTime? CheckReceiveTime { get; set; } + + /// <summary> + /// 鏈�杩戞彁浜ゆ椂闂� + /// </summary> + public DateTime? LastSubmitTime { get; set; } + + /// <summary> + /// 鏈�杩戦獙鏀舵椂闂� + /// </summary> + public DateTime? LastCheckReceiveTime { get; set; } + + /// <summary> + /// 鎻愪氦 + /// </summary> + public List<TaskInfoUserSubmit> Submits { get; set; } + + public void Configure(EntityTypeBuilder<TaskInfoUser> entityBuilder, DbContext dbContext, Type dbContextLocator) + { + entityBuilder + .HasOne(it => it.EnterpriseEmployee) + .WithMany(it => it.TaskInfoUsers) + .HasForeignKey(it => it.EnterpriseEmployeeId) + .IsRequired() + .OnDelete(DeleteBehavior.Restrict); + } } } -- Gitblit v1.9.1