From 7d2c041bb99c38ab6c0884b5c78c73997a10316e Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Mon, 15 Jan 2024 13:48:13 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Order/Controllers/BalancesController.cs   |  2 +-
 .../Basic/Entity/GainfoGroupEntity.cs         | 29 +++++++++++++++++++
 .../Entity/GainfoGroupRelationshipEntity.cs   | 22 ++++++++++++++
 .../Sys/Entities/DevicePermissionEntity.cs    | 13 +++++++--
 .../Sys/Entities/MenuPermissionEntity.cs      |  2 +-
 ...tTypeEnumType.cs => AssignTypeEnumType.cs} | 12 ++++++--
 6 files changed, 72 insertions(+), 8 deletions(-)
 create mode 100644 Src/Dlhis.Entity/Basic/Entity/GainfoGroupEntity.cs
 create mode 100644 Src/Dlhis.Entity/Basic/Entity/GainfoGroupRelationshipEntity.cs
 rename Src/Dlhis.Entity/Sys/Enums/{MenuAssignmentTypeEnumType.cs => AssignTypeEnumType.cs} (71%)

diff --git a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
index e8934f50..9ac751e5 100644
--- a/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
+++ b/Src/Dlhis.Canteen/Order/Controllers/BalancesController.cs
@@ -23,7 +23,7 @@ public class BalancesController : ControllerBase
     }
 
     /// <summary>
-    /// 获取消费记录
+    /// 获取记录分页
     /// </summary>
     /// <param name="request"></param>
     /// <returns></returns>
diff --git a/Src/Dlhis.Entity/Basic/Entity/GainfoGroupEntity.cs b/Src/Dlhis.Entity/Basic/Entity/GainfoGroupEntity.cs
new file mode 100644
index 00000000..2243b9e5
--- /dev/null
+++ b/Src/Dlhis.Entity/Basic/Entity/GainfoGroupEntity.cs
@@ -0,0 +1,29 @@
+using Kurisu.SqlSugar;
+using SqlSugar;
+
+namespace Dlhis.Entity.Basic.Entity;
+
+/// <summary>
+/// 档案组
+/// </summary>
+[SugarTable(TableName = "GainfoGroup", TableDescription = "档案组")]
+public class GainfoGroupEntity : SugarBaseEntity
+{
+    /// <summary>
+    /// 分组code
+    /// </summary>
+    [SugarColumn(ColumnDescription = "分组code")]
+    public Guid Code { get; set; }
+
+    /// <summary>
+    /// 名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "名称")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnDescription = "备注")]
+    public string Remark { get; set; }
+}
diff --git a/Src/Dlhis.Entity/Basic/Entity/GainfoGroupRelationshipEntity.cs b/Src/Dlhis.Entity/Basic/Entity/GainfoGroupRelationshipEntity.cs
new file mode 100644
index 00000000..a8747085
--- /dev/null
+++ b/Src/Dlhis.Entity/Basic/Entity/GainfoGroupRelationshipEntity.cs
@@ -0,0 +1,22 @@
+using Kurisu.SqlSugar;
+using SqlSugar;
+
+namespace Dlhis.Entity.Basic.Entity;
+
+/// <summary>
+/// 档案人员组关系
+/// </summary>
+[SugarTable(TableName = "GainfoGroupRelationship", TableDescription = "档案人员组关系")]
+public class GainfoGroupRelationshipEntity : SugarBaseEntity
+{
+    /// <summary>
+    /// 分组code
+    /// </summary>
+    public Guid GroupCode { get; set; }
+
+    /// <summary>
+    /// 人员档案号
+    /// </summary>
+    [SugarColumn(ColumnDescription = "人员档案号")]
+    public string UserNo { get; set; }
+}
diff --git a/Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs b/Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs
index c6f98596..cb4e2e0f 100644
--- a/Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs
+++ b/Src/Dlhis.Entity/Sys/Entities/DevicePermissionEntity.cs
@@ -13,10 +13,17 @@ namespace Dlhis.Entity.Sys.Entities;
 public class DevicePermissionEntity : SugarBaseEntity, ITenantId, ISoftDeleted
 {
     /// <summary>
-    /// 人员档案
+    /// 分配权限类型
     /// </summary>
-    [SugarColumn(ColumnDescription = "人员档案")]
-    public string UserNo { get; set; }
+    [SugarColumn(ColumnDataType = "varchar(50)", ColumnDescription = "分配权限类型", SqlParameterDbType = typeof(EnumToStringConvert))]
+    public AssignTypeEnumType AssignType { get; set; }
+
+    /// <summary>
+    /// 分配值
+    /// </summary>
+    [SugarColumn(ColumnDescription = "分配值")]
+    public string AssignValue { get; set; }
+
 
     /// <summary>
     /// 设备权限类型
diff --git a/Src/Dlhis.Entity/Sys/Entities/MenuPermissionEntity.cs b/Src/Dlhis.Entity/Sys/Entities/MenuPermissionEntity.cs
index 33133cf2..67d38089 100644
--- a/Src/Dlhis.Entity/Sys/Entities/MenuPermissionEntity.cs
+++ b/Src/Dlhis.Entity/Sys/Entities/MenuPermissionEntity.cs
@@ -16,7 +16,7 @@ public class MenuPermissionEntity : SugarBaseEntity, ITenantId, ISoftDeleted
     /// 权限分配类型
     /// </summary>
     [SugarColumn(ColumnDataType = "varchar(50)", ColumnDescription = "权限分配类型", SqlParameterDbType = typeof(EnumToStringConvert))]
-    public MenuAssignmentTypeEnumType UniqueType { get; set; }
+    public AssignTypeEnumType UniqueType { get; set; }
 
     /// <summary>
     /// 类型值
diff --git a/Src/Dlhis.Entity/Sys/Enums/MenuAssignmentTypeEnumType.cs b/Src/Dlhis.Entity/Sys/Enums/AssignTypeEnumType.cs
similarity index 71%
rename from Src/Dlhis.Entity/Sys/Enums/MenuAssignmentTypeEnumType.cs
rename to Src/Dlhis.Entity/Sys/Enums/AssignTypeEnumType.cs
index 0d70d4b4..f41385d5 100644
--- a/Src/Dlhis.Entity/Sys/Enums/MenuAssignmentTypeEnumType.cs
+++ b/Src/Dlhis.Entity/Sys/Enums/AssignTypeEnumType.cs
@@ -5,8 +5,8 @@ namespace Dlhis.Entity.Sys.Enums;
 /// <summary>
 /// 权限类型
 /// </summary>
-[Description("权限分配类型")]
-public enum MenuAssignmentTypeEnumType
+[Description("分配类型")]
+public enum AssignTypeEnumType
 {
     /// <summary>
     /// 用户
@@ -30,5 +30,11 @@ public enum MenuAssignmentTypeEnumType
     /// 部门
     /// </summary>
     [Description("部门")]
-    Department = 4
+    Department = 4,
+
+    /// <summary>
+    /// 租户/基地
+    /// </summary>
+    [Description("租户/基地")]
+    Tenant = 5,
 }