From 301dae600f831f8ba500bf0e9dbdd87c6f861a88 Mon Sep 17 00:00:00 2001 From: sunpengfei <i@angelzzz.com> Date: 星期五, 08 八月 2025 14:38:10 +0800 Subject: [PATCH] fix:bug --- FlexJobApi.Core/Entities/Tasks/TaskInfo.cs | 96 ++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 89 insertions(+), 7 deletions(-) diff --git a/FlexJobApi.Core/Entities/Tasks/TaskInfo.cs b/FlexJobApi.Core/Entities/Tasks/TaskInfo.cs index 8dbfac7..47a7b5c 100644 --- a/FlexJobApi.Core/Entities/Tasks/TaskInfo.cs +++ b/FlexJobApi.Core/Entities/Tasks/TaskInfo.cs @@ -1,6 +1,10 @@ -锘縰sing System; +锘縰sing Furion.DatabaseAccessor; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Metadata.Builders; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -10,7 +14,7 @@ /// <summary> /// 浠诲姟淇℃伅 /// </summary> - public class TaskInfo : CommonEntity + public class TaskInfo : CommonEntity, IEntityTypeBuilder<TaskInfo> { public TaskInfo() { @@ -29,13 +33,18 @@ public Enterprise Enterprise { get; set; } /// <summary> + /// 浠诲姟鍗曞彿 + /// </summary> + public string Code { get; set; } + + /// <summary> /// 浠诲姟鍚嶇О /// </summary> [Required] public string Name { get; set; } /// <summary> - /// 璁¤垂鏂瑰紡 + /// 缁撶畻鍛ㄦ湡 /// </summary> public EnumBillingMethod BillingMethod { get; set; } @@ -75,19 +84,46 @@ public List<TaskInfoCredentialLimit> CredentialLimits { get; set; } /// <summary> - /// 浠诲姟鍦扮偣鎵�灞炲尯鍩烮d + /// 浠诲姟鍦扮偣鎵�灞炵渷浠界紪鍙� /// </summary> - public Guid CityId { get; set; } + public string ProvinceCode { get; set; } /// <summary> - /// 浠诲姟鍦扮偣鎵�灞炲尯鍩� + /// 浠诲姟鍦扮偣鎵�灞炵渷浠� + /// </summary> + public DictionaryData Province { get; set; } + + /// <summary> + /// 浠诲姟鍦扮偣鎵�灞炲煄甯傜紪鍙� + /// </summary> + public string CityCode { get; set; } + + /// <summary> + /// 浠诲姟鍦扮偣鎵�灞炲煄甯� /// </summary> public DictionaryData City { get; set; } /// <summary> + /// 浠诲姟鍦扮偣鍚嶇О + /// </summary> + public string AddressName { get; set; } + + /// <summary> /// 浠诲姟鍦扮偣璇︾粏鍦板潃 /// </summary> - public string Address { get; set; } + public string AddressDetail { get; set; } + + /// <summary> + /// 缁忓害 + /// </summary> + [Column(TypeName = "decimal(18,6)")] + public decimal? Longitude { get; set; } + + /// <summary> + /// 绾害 + /// </summary> + [Column(TypeName = "decimal(18,6)")] + public decimal? Latitude { get; set; } /// <summary> /// 浠诲姟寮�濮嬫椂闂� @@ -98,5 +134,51 @@ /// 浠诲姟缁撴潫鏃堕棿 /// </summary> public DateTime EndTime { get; set; } + + /// <summary> + /// 浠诲姟鐘舵�� + /// </summary> + public EnumTaskStatus Status { get; set; } + + /// <summary> + /// 鍙戝竷鐘舵�� + /// </summary> + public EnumTaskReleaseStatus ReleaseStatus { get; set; } + + /// <summary> + /// 楠屾敹鐘舵�� + /// </summary> + public EnumTaskCheckReceiveStatus? CheckReceiveStatus { get; set; } + + /// <summary> + /// 缁撶畻鐘舵�� + /// </summary> + public EnumTaskSettlementStatus? SettlementStatus { get; set; } + + /// <summary> + /// 鎺ㄨ崘鐘舵�� + /// </summary> + public EnumTaskRecommendStatus RecommendStatus { get; set; } + + /// <summary> + /// 鐢ㄦ埛 + /// </summary> + public List<TaskInfoUser> Users { get; set; } + + public void Configure(EntityTypeBuilder<TaskInfo> entityBuilder, DbContext dbContext, Type dbContextLocator) + { + entityBuilder + .HasOne(it => it.Province) + .WithMany() + .HasForeignKey(it => it.ProvinceCode) + .HasPrincipalKey(it => it.Code) + .OnDelete(DeleteBehavior.Restrict); + entityBuilder + .HasOne(it => it.City) + .WithMany() + .HasForeignKey(it => it.CityCode) + .HasPrincipalKey(it => it.Code) + .OnDelete(DeleteBehavior.Restrict); + } } } -- Gitblit v1.9.1