fix 逻辑调整

Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentDetailEntity.cs

@@ -55,7 +55,7 @@ public class VisitorAppointmentDetailEntity : SugarBaseEntity
     /// 状态
     /// </summary>
     [SugarColumn(IsNullable = false, ColumnDescription = "状态", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
-    public AppointmentDetailEnumType Status { get; set; }
+    public VisitorAppointmentDetailStatusEnumType Status { get; set; }
 
     /// <summary>
     /// 备注

Src/Dlhis.Entity/Visitor/Entity/VisitorAppointmentEntity.cs

@@ -1,5 +1,7 @@
-using Kurisu.AspNetCore.DataAccess.SqlSugar;
+using Dlhis.Entity.Visitor.Enums;
+using Kurisu.AspNetCore.DataAccess.SqlSugar;
 using SqlSugar;
+using SqlSugar.DbConvert;
 
 namespace Dlhis.Entity.Visitor.Entity;
 
@@ -39,7 +41,7 @@ public class VisitorAppointmentEntity : SugarBaseEntity
     /// 预约门禁区域
     /// </summary>
     public string ApplyDoorArea { get; set; }
-    
+
 
     /// <summary>
     /// 访客开始
@@ -59,7 +61,8 @@ public class VisitorAppointmentEntity : SugarBaseEntity
     /// <summary>
     /// 申请车间区域
     /// </summary>
-    public string ApplyWorkplaceArea { get; set; }
+    [SugarColumn(ColumnDescription = "车间区域", IsJson = true, DefaultValue = "[]")]
+    public List<string> ApplyWorkplaceAreas { get; set; }
 
     /// <summary>
     /// 车间访问开始
@@ -70,12 +73,12 @@ public class VisitorAppointmentEntity : SugarBaseEntity
     /// 车间访问结束
     /// </summary>
     public DateTime? WorkplaceEnd { get; set; }
-    
+
     /// <summary>
     /// 备注
     /// </summary>
     public string Remark { get; set; }
-    
+
     /// <summary>
     /// 预约厂区
     /// </summary>
@@ -85,4 +88,10 @@ public class VisitorAppointmentEntity : SugarBaseEntity
     /// 申请事由
     /// </summary>
     public string Reason { get; set; }
+
+    /// <summary>
+    /// 状态
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "状态", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
+    public VisitorAppointmentStatusEnumType Status { get; set; }
 }

Src/Dlhis.Entity/Visitor/Enums/VisitorAppointmentDetailStatusEnumType.cs

@@ -6,7 +6,7 @@ namespace Dlhis.Entity.Visitor.Enums;
 /// 访客预约明细状态
 /// </summary>
 [Description("预约状态")]
-public enum AppointmentDetailEnumType
+public enum VisitorAppointmentDetailStatusEnumType
 {
     /// <summary>
     /// 待来访
@@ -25,11 +25,16 @@ public enum AppointmentDetailEnumType
     /// </summary>
     [Description("到达")]
     Arrived = 10,
-
-
+    
     /// <summary>
     /// 离开
     /// </summary>
     [Description("离开")]
-    Leave = 99
+    Leave = 11,
+    
+    /// <summary>
+    /// 作废
+    /// </summary>
+    [Description("作废")]
+    Obsolete = 99
 }

Src/Dlhis.Entity/Visitor/Enums/VisitorAppointmentStatusEnumType.cs

@@ -6,17 +6,17 @@ namespace Dlhis.Entity.Visitor.Enums;
 /// 访客预约明细状态
 /// </summary>
 [Description("访客预约状态")]
-public enum VisitorAppointmentDetailEnumType
+public enum VisitorAppointmentStatusEnumType
 {
     /// <summary>
     /// 到达
     /// </summary>
     [Description("到达")]
-    Arrived = 1,
+    Valid = 1,
 
     /// <summary>
-    /// 离开
+    /// 作废
     /// </summary>
-    [Description("离开")]
-    Leave = 99
+    [Description("作废")]
+    Obsolete = 99
 }