diff --git a/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs b/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
index 66ff9e59..d1462881 100644
--- a/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/GainfoEntity.cs
@@ -14,7 +14,7 @@ public class GainfoEntity : SugarBaseEntity
///
/// 档案号
///
- [SugarColumn(ColumnDescription = "档案号")]
+ [SugarColumn(ColumnDescription = "档案号", UniqueGroupNameList = new[] { "idx_Gainfo_No" })]
public string No { get; set; }
///
@@ -44,7 +44,7 @@ public class GainfoEntity : SugarBaseEntity
///
/// 学工号
///
- [SugarColumn(ColumnDescription = "学工号")]
+ [SugarColumn(ColumnDescription = "学工号", UniqueGroupNameList = new[] { "idx_Gainfo_Code" })]
public string Code { get; set; }
///
@@ -128,7 +128,7 @@ public class GainfoEntity : SugarBaseEntity
///
/// 卡号
///
- [SugarColumn(ColumnDescription = "卡号")]
+ [SugarColumn(ColumnDescription = "卡号", IndexGroupNameList = new[] { "idx_Gainfo_CardNo" })]
public string CardNo { get; set; }
///
@@ -149,19 +149,47 @@ public class GainfoEntity : SugarBaseEntity
public string CostId { get; set; }
///
- /// 身份认证用户Id
+ /// 身份认证用户Id
///
- [SugarColumn(ColumnDescription = "身份认证用户Id")]
+ [SugarColumn(ColumnDescription = "身份认证用户Id", IndexGroupNameList = new[] { "idx_Gainfo_IdentityUserId" })]
public int IdentityUserId { get; set; }
}
-//[SugarTable(TableName = "GainfoLeave", TableDescription = "离职人员档案表")]
-//public class GainfoLeaveEntity : GainfoEntity
-//{
+///
+/// 离职人员档案表
+///
+[SugarTable(TableName = "GainfoLeave", TableDescription = "离职人员档案表")]
+public class GainfoLeaveEntity : GainfoEntity
+{
+}
-//}
-//[SugarTable(TableName = "GainfoExternal", TableDescription = "外部人员档案表")]
-//public class GainfoExternalEntity : GainfoEntity
-//{
+///
+/// 外部人员档案表
+///
+[SugarTable(TableName = "GainfoExternal", TableDescription = "外部人员档案表")]
+public class GainfoExternalEntity : GainfoEntity
+{
+ ///
+ /// 公司
+ ///
+ [SugarColumn(ColumnDescription = "公司", IsNullable = false)]
+ public string Company { get; set; }
-//}
+ ///
+ /// 到达时间
+ ///
+ [SugarColumn(ColumnDescription = "到达时间")]
+ public DateTime From { get; set; }
+
+ ///
+ /// 离开时间
+ ///
+ [SugarColumn(ColumnDescription = "离开时间")]
+ public DateTime To { get; set; }
+
+ ///
+ /// 对接人No
+ ///
+ [SugarColumn(ColumnDescription = "对接人", IsNullable = false)]
+ public string JinkoNo { get; set; }
+}
diff --git a/Src/Dlhis.Entity/Device/Entities/DeviceTask.cs b/Src/Dlhis.Entity/Device/Entities/DeviceTask.cs
index 4d0b5a4b..84708348 100644
--- a/Src/Dlhis.Entity/Device/Entities/DeviceTask.cs
+++ b/Src/Dlhis.Entity/Device/Entities/DeviceTask.cs
@@ -23,10 +23,6 @@ public class DeviceTaskEntity : SugarBaseEntity, ITenantId, IVersion
///
public string UserNo { get; set; }
- ///
- /// 用户学工号
- ///
- public string UserCode { get; set; }
///
/// 设备唯一号