fix 提交已经问题处理

Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs

@@ -1,6 +1,7 @@
 using Dlhis.Entity.Basic.Enums;
 using Kurisu.AspNetCore.DataAccess.SqlSugar;
 using Kurisu.AspNetCore.DataAccess.SqlSugar.Attributes;
+using Mapster;
 using SqlSugar;
 using SqlSugar.DbConvert;
 
@@ -13,23 +14,30 @@ namespace Dlhis.Entity.Basic.Entity;
 public class GainfoEntity : SugarBaseEntity
 {
     /// <summary>
-    ///     档案号
+    /// 档案号
     /// </summary>
     [SugarColumn(ColumnDescription = "档案号", UniqueGroupNameList = new[] { "idx_Gainfo_No" })]
     public string No { get; set; }
 
     /// <summary>
-    ///     SAP内部编号
+    /// 内部编号
     /// </summary>
-    [SugarColumn(ColumnDescription = "SAP内部编号")]
-    public string SapNo { get; set; }
+    [SugarColumn(IsNullable = true, ColumnDescription = "内部编号")]
+    public string InternalNo { get; set; }
 
     /// <summary>
-    /// 员类型
+    /// 人员类型
     /// </summary>
+    [AdaptIgnore(MemberSide.Destination)]
     [SugarColumn(ColumnDescription = "人员类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
     public GainfoUserTypeEnumType Type { get; set; }
 
+    /// <summary>
+    /// 人员来源
+    /// </summary>
+    [SugarColumn(ColumnDescription = "人员来源", IsNullable = true)]
+    public string Source { get; set; }
+
     /// <summary>
     /// 姓名
     /// </summary>
@@ -37,61 +45,55 @@ public class GainfoEntity : SugarBaseEntity
     public string Name { get; set; }
 
     /// <summary>
-    ///     学工号
+    /// 学工号
     /// </summary>
     [SugarColumn(ColumnDescription = "学工号", UniqueGroupNameList = new[] { "idx_Gainfo_Code" })]
     public string Code { get; set; }
 
     /// <summary>
-    ///     国家代码
+    /// 国家代码
     /// </summary>
     [SugarColumn(ColumnDescription = "国家代码")]
     public string CountryNo { get; set; }
 
     /// <summary>
-    ///     证件类型代码
+    /// 证件类型代码
     /// </summary>
     [SugarColumn(ColumnDescription = "证件类型代码")]
     public string IdClass { get; set; }
 
     /// <summary>
-    ///     身份证号
+    /// 身份证号
     /// </summary>
     [SugarColumn(ColumnDescription = "身份证号", UniqueGroupNameList = new[] { "idx_Gainfo_IdNo" })]
     public string IdNo { get; set; }
 
     /// <summary>
-    ///     身份证籍贯区域代码
+    /// 身份证籍贯区域代码
     /// </summary>
     [SugarColumn(ColumnDescription = "身份证籍贯区域代码")]
     public string Native { get; set; }
 
     /// <summary>
-    ///     性别
+    /// 性别
     /// </summary>
     [SugarColumn(ColumnDescription = "性别", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
     public GenderEnumType Gender { get; set; }
 
     /// <summary>
-    ///     生日
+    /// 生日
     /// </summary>
     [SugarColumn(ColumnDescription = "生日")]
     public DateTime Birthday { get; set; }
 
     /// <summary>
-    ///     身份证地址
+    /// 身份证地址
     /// </summary>
     [SugarColumn(ColumnDescription = "身份证地址")]
     public string Address { get; set; }
 
-    ///// <summary>
-    ///// 已婚/未婚
-    ///// </summary>
-    //[SugarColumn(ColumnDescription = "已婚/未婚")]
-    //public string Marital { get; set; }
-
     /// <summary>
-    ///     部门编码
+    /// 部门编码
     /// </summary>
     [SugarColumn(ColumnDescription = "部门编码")]
     public string DepartmentNo { get; set; }
@@ -187,28 +189,17 @@ public class GainfoEntity : SugarBaseEntity
     [SugarColumn(ColumnDescription = "身份认证用户Id", IsNullable = true)]
     public int IdentityUserId { get; set; }
 
-
+    /// <summary>
+    /// 卡类型
+    /// </summary>
     [SugarColumn(ColumnDescription = "卡类型", IsNullable = true)]
     public int? CardType { get; set; }
 }
 
 /// <summary>
-///     离职人员档案表
+/// 离职人员档案表
 /// </summary>
 [SugarTable(TableName = "GainfoLeave", TableDescription = "离职人员档案表")]
 public class GainfoLeaveEntity : GainfoEntity
 {
-}
-
-/// <summary>
-///     外部人员档案表
-/// </summary>
-[SugarTable(TableName = "GainfoExternal", TableDescription = "外部人员档案表")]
-public class GainfoExternalEntity : GainfoEntity
-{
-    /// <summary>
-    ///     公司
-    /// </summary>
-    [SugarColumn(ColumnDescription = "公司", IsNullable = false)]
-    public string Company { get; set; }
 }

Src/Dlhis.Entity/Basic/Enums/GainfoUserTypeEnumType.cs

@@ -15,7 +15,19 @@ public enum GainfoUserTypeEnumType
     Normal = 1,
 
     /// <summary>
-    /// 安检白名单
+    /// 外包人员
+    /// </summary>
+    [Description("外包人员")]
+    Outsource = 2,
+
+    /// <summary>
+    /// 外部人员
+    /// </summary>
+    [Description("外部人员")]
+    External = 3,
+
+    /// <summary>
+    /// 安检白名单(也属于普通人员)
     /// </summary>
     [Description("安检白名单")]
     SecurityWhite = 99

Src/Dlhis.Entity/Visitor/Entity/AppointmentAreaEntity.cs

@@ -19,7 +19,7 @@ public class AppointmentAreaEntity : SugarBaseEntity, ITenantId, ISoftDeleted
     [AdaptIgnore(MemberSide.Destination)]
     [SugarColumn(IsNullable = false, ColumnDescription = "区域类型", ColumnDataType = "varchar(50)",
         SqlParameterDbType = typeof(EnumToStringConvert),
-        UniqueGroupNameList = new[] { "idx_ApponintmentArea_t_cc_tid" })]
+        UniqueGroupNameList = new[] { "idx_AppointmentArea_t_cc_tid" })]
     public AppointmentAreaEnumType Type { get; set; }
 
     /// <summary>
@@ -27,7 +27,7 @@ public class AppointmentAreaEntity : SugarBaseEntity, ITenantId, ISoftDeleted
     /// </summary>
     [AdaptIgnore(MemberSide.Destination)]
     [SugarColumn(IsNullable = false, ColumnDescription = "自定义编码",
-        UniqueGroupNameList = new[] { "idx_ApponintmentArea_t_cc_tid" })]
+        UniqueGroupNameList = new[] { "idx_AppointmentArea_t_cc_tid" })]
     public string CustomCode { get; set; }
 
     /// <summary>
@@ -46,7 +46,7 @@ public class AppointmentAreaEntity : SugarBaseEntity, ITenantId, ISoftDeleted
     /// 基地/租户
     /// </summary>
     [SugarColumn(IsNullable = false, ColumnDescription = " 基地/租户",
-        UniqueGroupNameList = new[] { "idx_ApponintmentArea_t_cc_tid" })]
+        UniqueGroupNameList = new[] { "idx_AppointmentArea_t_cc_tid" })]
     public string TenantId { get; set; }
 
 

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

@@ -11,7 +11,7 @@ namespace Dlhis.Entity.Visitor.Entity;
 [SugarTable(TableName = "VisitorAppointmentDetail", TableDescription = "访客预约")]
 public class VisitorAppointmentDetailEntity : SugarBaseEntity
 {
-    [SugarColumn(IsNullable = false, ColumnDescription = "父id")]
+    [SugarColumn(IsNullable = false, ColumnDescription = "pid")]
     public long AppointmentId { get; set; }
 
     /// <summary>
@@ -20,12 +20,6 @@ public class VisitorAppointmentDetailEntity : SugarBaseEntity
     [SugarColumn(IsNullable = false, ColumnDescription = "流水号")]
     public string No { get; set; }
 
-    /// <summary>
-    /// 是否外部人员
-    /// </summary>
-    [SugarColumn(IsNullable = false, ColumnDataType = "bit")]
-    public bool IsExternal { get; set; }
-
     /// <summary>
     /// no
     /// </summary>
@@ -44,16 +38,6 @@ public class VisitorAppointmentDetailEntity : SugarBaseEntity
     [SugarColumn(IsNullable = false, ColumnDescription = "手机号")]
     public string Phone { get; set; }
 
-
-    /// <summary>
-    /// 身份证
-    /// </summary>
-    /// <remarks>
-    /// 使用身份证字段作为申请人唯一标识
-    /// </remarks>
-    [SugarColumn(IsNullable = false, ColumnDescription = "身份证")]
-    public string IdNo { get; set; }
-
     /// <summary>
     /// 车牌
     /// </summary>

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

@@ -18,5 +18,5 @@ public enum AppointmentAreaEnumType
     /// 车间
     /// </summary>
     [Description("车间")]
-    Workshop = 2,
-}
+    Workplace = 2
+}