From 149660ca0f7ed6eb43ba1701f8d62d5ec346f3cb Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Fri, 15 Mar 2024 18:03:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=AE=9E=E4=BD=93=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BusinessPlaceManagerRelationshipEntity.cs | 23 +++++++
 .../Basic/Entity/BusinessShiftEntity.cs       |  8 +--
 .../Canteen/Entities/DishesCategoryEntity.cs  | 35 +++++++++++
 ...CanteenDishesEntity.cs => DishesEntity.cs} | 20 ++----
 .../Canteen/Enums/ShiftEnumType.cs            | 61 +++++++++----------
 5 files changed, 96 insertions(+), 51 deletions(-)
 create mode 100644 Src/Dlhis.Entity/Basic/Entity/BusinessPlaceManagerRelationshipEntity.cs
 create mode 100644 Src/Dlhis.Entity/Canteen/Entities/DishesCategoryEntity.cs
 rename Src/Dlhis.Entity/Canteen/Entities/{CanteenDishesEntity.cs => DishesEntity.cs} (71%)

diff --git a/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceManagerRelationshipEntity.cs b/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceManagerRelationshipEntity.cs
new file mode 100644
index 00000000..8c9d1b07
--- /dev/null
+++ b/Src/Dlhis.Entity/Basic/Entity/BusinessPlaceManagerRelationshipEntity.cs
@@ -0,0 +1,23 @@
+using Kurisu.SqlSugar;
+using SqlSugar;
+
+namespace Dlhis.Entity.Basic.Entity;
+
+/// <summary>
+/// 营业点管理
+/// </summary>
+[SugarTable(TableName = "BusinessPlaceManagerRelationship", TableDescription = "营业点管理关系")]
+public class BusinessPlaceManagerRelationshipEntity : SugarBaseEntity
+{
+    /// <summary>
+    /// 管理人员
+    /// </summary>
+    [SugarColumn(ColumnDescription = "管理人员", IsNullable = false)]
+    public int ManagerUserId { get; set; }
+
+    /// <summary>
+    /// 营业点
+    /// </summary>
+    [SugarColumn(ColumnDescription = "营业点", IsNullable = false)]
+    public Guid BusinessPlaceCode { get; set; }
+}
diff --git a/Src/Dlhis.Entity/Basic/Entity/BusinessShiftEntity.cs b/Src/Dlhis.Entity/Basic/Entity/BusinessShiftEntity.cs
index 8964221f..e80d81ee 100644
--- a/Src/Dlhis.Entity/Basic/Entity/BusinessShiftEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/BusinessShiftEntity.cs
@@ -6,9 +6,9 @@ using SqlSugar;
 namespace Dlhis.Entity.Basic.Entity;
 
 /// <summary>
-/// 营业点餐次
+/// 营业点餐别
 /// </summary>
-[SugarTable(TableName = "BusinessShift", TableDescription = "营业点餐次")]
+[SugarTable(TableName = "BusinessShift", TableDescription = "营业点餐别")]
 public class BusinessShiftEntity : SugarBaseEntity, ITenantId
 {
     /// <summary>
@@ -25,9 +25,9 @@ public class BusinessShiftEntity : SugarBaseEntity, ITenantId
     public string CustomCode { get; set; }
 
     /// <summary>
-    /// 餐次名称
+    /// 餐别名称
     /// </summary>
-    [SugarColumn(ColumnDescription = "餐次名称")]
+    [SugarColumn(ColumnDescription = "餐别名称")]
     public string Name { get; set; }
 
     public string TenantId { get; set; }
diff --git a/Src/Dlhis.Entity/Canteen/Entities/DishesCategoryEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/DishesCategoryEntity.cs
new file mode 100644
index 00000000..0f40049f
--- /dev/null
+++ b/Src/Dlhis.Entity/Canteen/Entities/DishesCategoryEntity.cs
@@ -0,0 +1,35 @@
+using Kurisu.Core.DataAccess.Entity;
+using Kurisu.SqlSugar;
+using SqlSugar;
+
+namespace Dlhis.Entity.Canteen.Entities;
+
+[SugarTable(TableName = "DishesCategory", TableDescription = "菜品分类")]
+public class DishesCategoryEntity : SugarBaseEntity, ITenantId
+{
+    /// <summary>
+    /// PCode
+    /// </summary>
+    public Guid? PCode { get; set; }
+
+    /// <summary>
+    /// Code
+    /// </summary>
+    [SugarColumn(IsNullable = false)]
+    public Guid Code { get; set; }
+
+    /// <summary>
+    /// 分类名称
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "名称")]
+    public string Name { get; set; }
+
+    /// <summary>
+    /// 序号
+    /// </summary>
+    [SugarColumn(IsNullable = false, ColumnDescription = "序号", DefaultValue = "100")]
+    public int Sequence { get; set; } = 100;
+
+
+    public string TenantId { get; set; }
+}
diff --git a/Src/Dlhis.Entity/Canteen/Entities/CanteenDishesEntity.cs b/Src/Dlhis.Entity/Canteen/Entities/DishesEntity.cs
similarity index 71%
rename from Src/Dlhis.Entity/Canteen/Entities/CanteenDishesEntity.cs
rename to Src/Dlhis.Entity/Canteen/Entities/DishesEntity.cs
index b28482aa..b1c9977f 100644
--- a/Src/Dlhis.Entity/Canteen/Entities/CanteenDishesEntity.cs
+++ b/Src/Dlhis.Entity/Canteen/Entities/DishesEntity.cs
@@ -8,20 +8,14 @@ namespace Dlhis.Entity.Canteen.Entities;
 /// <summary>
 /// 菜品表
 /// </summary>
-[SugarTable(TableName = "CanteenDishes", TableDescription = "菜品表")]
-public class CanteenDishesEntity : SugarBaseEntity, ITenantId
+[SugarTable(TableName = "Dishes", TableDescription = "菜品表")]
+public class DishesEntity : SugarBaseEntity, ITenantId
 {
     /// <summary>
-    /// 大类
-    /// </summary>
-    [SugarColumn(ColumnDescription = "父类")]
-    public string PCategory { get; set; }
-
-    /// <summary>
-    /// 小类
+    /// 分类
     /// </summary>
     [SugarColumn(ColumnDescription = "分类", IsNullable = false)]
-    public string Category { get; set; }
+    public Guid CategoryCode { get; set; }
 
     /// <summary>
     /// 营业点
@@ -41,12 +35,6 @@ public class CanteenDishesEntity : SugarBaseEntity, ITenantId
     [SugarColumn(ColumnDescription = "菜品名称", IsNullable = false)]
     public string Name { get; set; }
 
-    ///// <summary>
-    ///// 类型
-    ///// </summary>
-    //[SugarColumn(ColumnDescription = "类型", ColumnDataType = "varchar(50)", SqlParameterDbType = typeof(EnumToStringConvert))]
-    //public CanteenDishesEnumType Type { get; set; }
-
     /// <summary>
     /// 描述
     /// </summary>
diff --git a/Src/Dlhis.Entity/Canteen/Enums/ShiftEnumType.cs b/Src/Dlhis.Entity/Canteen/Enums/ShiftEnumType.cs
index d760412a..410b9f27 100644
--- a/Src/Dlhis.Entity/Canteen/Enums/ShiftEnumType.cs
+++ b/Src/Dlhis.Entity/Canteen/Enums/ShiftEnumType.cs
@@ -1,41 +1,40 @@
 using System.ComponentModel;
 
-namespace Dlhis.Entity.Canteen.Enums
+namespace Dlhis.Entity.Canteen.Enums;
+
+/// <summary>
+/// 餐次 ShiftEnumType
+/// </summary>
+[Description("餐次")]
+public enum ShiftEnumType
 {
     /// <summary>
-    /// 餐次
+    /// 早餐
     /// </summary>
-    [Description("餐次")]
-    public enum ShiftEnumType
-    {
-        /// <summary>
-        /// 早餐
-        /// </summary>
-        [Description("早餐")]
-        Breakfast = 1,
+    [Description("早餐")]
+    Breakfast = 1,
 
-        /// <summary>
-        /// 午餐
-        /// </summary>
-        [Description("午餐")]
-        Lunch = 2,
+    /// <summary>
+    /// 午餐
+    /// </summary>
+    [Description("午餐")]
+    Lunch = 2,
 
-        /// <summary>
-        /// 晚餐
-        /// </summary>
-        [Description("晚餐")]
-        Dinner = 3,
+    /// <summary>
+    /// 晚餐
+    /// </summary>
+    [Description("晚餐")]
+    Dinner = 3,
 
-        /// <summary>
-        /// 宵夜
-        /// </summary>
-        [Description("宵夜")]
-        Nightsnack = 4,
+    /// <summary>
+    /// 宵夜
+    /// </summary>
+    [Description("宵夜")]
+    Nightsnack = 4,
 
-        /// <summary>
-        /// 凌晨餐
-        /// </summary>
-        [Description("凌晨餐")]
-        Midnightsnack = 5,
-    }
+    /// <summary>
+    /// 凌晨餐
+    /// </summary>
+    [Description("凌晨餐")]
+    Midnightsnack = 5,
 }
\ No newline at end of file