From 1bf4dd9ec6e3b559882e59c57531ae99d0a779d2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com>
Date: Sun, 2 Jun 2024 18:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Models/AppointSchedule.cs                 | 35 ++++++++++----
 .../Models/AppointScheduleCustomerOrg.cs      | 34 ++++++++++----
 .../Models/AppointScheduleTemplate.cs         | 46 ++++++++++++++++---
 .../Models/AppointScheduleTime.cs             | 35 ++++++++++----
 .../Configures/AppointScheduleConfigure.cs    |  5 +-
 .../AppointScheduleTemplateConfigure.cs       |  1 +
 6 files changed, 123 insertions(+), 33 deletions(-)

diff --git a/src/Shentun.WebPeis.Domain/Models/AppointSchedule.cs b/src/Shentun.WebPeis.Domain/Models/AppointSchedule.cs
index 28f62b6..0d8a787 100644
--- a/src/Shentun.WebPeis.Domain/Models/AppointSchedule.cs
+++ b/src/Shentun.WebPeis.Domain/Models/AppointSchedule.cs
@@ -1,26 +1,45 @@
 using System;
 using System.Collections.Generic;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Domain.Entities;
 
 namespace Shentun.WebPeis.Models;
 
-public partial class AppointSchedule
+/// <summary>
+/// 预约计划主表
+/// </summary>
+public partial class AppointSchedule : AuditedEntity, IHasConcurrencyStamp
 {
+    /// <summary>
+    /// 预约日期
+    /// </summary>
     public DateTime? AppointDate { get; set; }
+    /// <summary>
+    /// 上午数量限制
+    /// </summary>
 
     public int AmNumberLimit { get; set; }
+    /// <summary>
+    /// 下午数量限制
+    /// </summary>
     public int PmNumberLimit { get; set; }
+    /// <summary>
+    /// 个人体检数量限制
+    /// </summary>
 
-    public DateTime? CreationTime { get; set; }
-
-    public Guid? CreatorId { get; set; }
-
-    public DateTime? LastModificationTime { get; set; }
-
-    public Guid? LastModifierId { get; set; }
+    public int SingleNumberLimit { get; set; }
 
     public string? ConcurrencyStamp { get; set; }
+    /// <summary>
+    /// 主键
+    /// </summary>
 
     public Guid AppointScheduleId { get; set; }
 
     public virtual ICollection<AppointScheduleTime> AppointScheduleTimes { get; set; } = new List<AppointScheduleTime>();
+
+    public override object?[] GetKeys()
+    {
+        return [AppointScheduleId];
+    }
 }
diff --git a/src/Shentun.WebPeis.Domain/Models/AppointScheduleCustomerOrg.cs b/src/Shentun.WebPeis.Domain/Models/AppointScheduleCustomerOrg.cs
index 16eaf86..7e2190c 100644
--- a/src/Shentun.WebPeis.Domain/Models/AppointScheduleCustomerOrg.cs
+++ b/src/Shentun.WebPeis.Domain/Models/AppointScheduleCustomerOrg.cs
@@ -1,26 +1,44 @@
 using System;
 using System.Collections.Generic;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Domain.Entities;
 
 namespace Shentun.WebPeis.Models;
 
-public partial class AppointScheduleCustomerOrg
+/// <summary>
+/// 单位预约计划
+/// </summary>
+public partial class AppointScheduleCustomerOrg : AuditedEntity, IHasConcurrencyStamp
 {
+    /// <summary>
+    /// 主键
+    /// </summary>
     public Guid AppointScheduleCustomerOrgId { get; set; }
+    /// <summary>
+    /// 单位ID
+    /// </summary>
     public Guid CustomerOrgId { get; set; }
+    /// <summary>
+    /// 开始日期
+    /// </summary>
 
     public DateTime? StartDate { get; set; }
+    /// <summary>
+    /// 结束日期
+    /// </summary>
 
     public DateTime? StopDate { get; set; }
+    /// <summary>
+    /// 数量限制
+    /// </summary>
 
     public int? NumberLimit { get; set; }
 
-    public DateTime? CreationTime { get; set; }
-
-    public Guid? CreatorId { get; set; }
-
-    public DateTime? LastModificationTime { get; set; }
-
-    public Guid? LastModifierId { get; set; }
 
     public string? ConcurrencyStamp { get; set; }
+
+    public override object?[] GetKeys()
+    {
+        return [AppointScheduleCustomerOrgId];
+    }
 }
diff --git a/src/Shentun.WebPeis.Domain/Models/AppointScheduleTemplate.cs b/src/Shentun.WebPeis.Domain/Models/AppointScheduleTemplate.cs
index a2547b3..c8c3737 100644
--- a/src/Shentun.WebPeis.Domain/Models/AppointScheduleTemplate.cs
+++ b/src/Shentun.WebPeis.Domain/Models/AppointScheduleTemplate.cs
@@ -1,35 +1,67 @@
 using System;
 using System.Collections.Generic;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Domain.Entities;
 
 namespace Shentun.WebPeis.Models;
 
-public partial class AppointScheduleTemplate
+/// <summary>
+/// 预约计划模板
+/// </summary>
+public partial class AppointScheduleTemplate : AuditedEntity, IHasConcurrencyStamp
 {
+    /// <summary>
+    /// 主键
+    /// </summary>
     public Guid AppointScheduleTemplateId { get; set; }
+    /// <summary>
+    /// 星期
+    /// </summary>
 
     public int? WeekId { get; set; }
+    /// <summary>
+    /// 上午数量限制
+    /// </summary>
 
     public int AmNumberLimit { get; set; }
+    /// <summary>
+    /// 下午数量限制
+    /// </summary>
 
     public int PmNumberLimit { get; set; }
+    /// <summary>
+    /// 个人体检数量限制
+    /// </summary>
+    public int SingleNumberLimit { get; set; }
+    /// <summary>
+    /// 上午上班时间
+    /// </summary>
 
     public TimeOnly? AmStartTime { get; set; }
+    /// <summary>
+    /// 上午下班时间
+    /// </summary>
 
     public TimeOnly? AmStopTime { get; set; }
+    /// <summary>
+    /// 下午上班时间
+    /// </summary>
 
     public TimeOnly? PmStartTime { get; set; }
+    /// <summary>
+    /// 下午下班时间
+    /// </summary>
 
     public TimeOnly? PmStopTime { get; set; }
 
     public int? DisplayOrder { get; set; }
 
-    public DateTime? CreationTime { get; set; }
 
-    public Guid? CreatorId { get; set; }
-
-    public DateTime? LastModificationTime { get; set; }
-
-    public Guid? LastModifierId { get; set; }
 
     public string? ConcurrencyStamp { get; set; }
+
+    public override object?[] GetKeys()
+    {
+        return [AppointScheduleTemplateId];
+    }
 }
diff --git a/src/Shentun.WebPeis.Domain/Models/AppointScheduleTime.cs b/src/Shentun.WebPeis.Domain/Models/AppointScheduleTime.cs
index 26ecbb9..259ab07 100644
--- a/src/Shentun.WebPeis.Domain/Models/AppointScheduleTime.cs
+++ b/src/Shentun.WebPeis.Domain/Models/AppointScheduleTime.cs
@@ -1,31 +1,50 @@
 using System;
 using System.Collections.Generic;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Domain.Entities;
 
 namespace Shentun.WebPeis.Models;
 
-public partial class AppointScheduleTime
+/// <summary>
+/// 预约计划明细表
+/// </summary>
+public partial class AppointScheduleTime : AuditedEntity, IHasConcurrencyStamp
 {
+    /// <summary>
+    /// 主键
+    /// </summary>
     public Guid AppointScheduleTimeId { get; set; }
+    /// <summary>
+    /// 开始时间
+    /// </summary>
 
     public TimeOnly? StartTime { get; set; }
+    /// <summary>
+    /// 结束时间
+    /// </summary>
 
     public TimeOnly? StopTime { get; set; }
+    /// <summary>
+    /// 数量限制
+    /// </summary>
 
     public int? NumberLimit { get; set; }
+    /// <summary>
+    /// 已预约数
+    /// </summary>
 
     public int? AppointNumber { get; set; }
 
-    public DateTime? CreationTime { get; set; }
-
-    public Guid? CreatorId { get; set; }
-
-    public DateTime? LastModificationTime { get; set; }
-
-    public Guid? LastModifierId { get; set; }
+  
 
     public string? ConcurrencyStamp { get; set; }
 
     public Guid? AppointScheduleId { get; set; }
 
     public virtual AppointSchedule? AppointSchedule { get; set; }
+
+    public override object?[] GetKeys()
+    {
+        return [AppointScheduleTimeId];
+    }
 }
diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/AppointScheduleConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/AppointScheduleConfigure.cs
index 30f1ad3..d60cc36 100644
--- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/AppointScheduleConfigure.cs
+++ b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/AppointScheduleConfigure.cs
@@ -37,8 +37,9 @@ namespace Shentun.WebPeis.Configures
                 .HasColumnType("timestamp without time zone")
                 .HasColumnName("last_modification_time");
             entity.Property(e => e.LastModifierId).HasColumnName("last_modifier_id");
-            entity.Property(e => e.AmNumberLimit).HasColumnName("number_limit");
-            entity.Property(e => e.PmNumberLimit).HasColumnName("pm_number_limit");
+            entity.Property(e => e.AmNumberLimit).IsRequired().HasColumnName("number_limit");
+            entity.Property(e => e.PmNumberLimit).IsRequired().HasColumnName("pm_number_limit");
+            entity.Property(e => e.SingleNumberLimit).IsRequired().HasColumnName("single_number_limit");
         }
     }
 }
diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/AppointScheduleTemplateConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/AppointScheduleTemplateConfigure.cs
index d3af64c..b6dd9f8 100644
--- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/AppointScheduleTemplateConfigure.cs
+++ b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/AppointScheduleTemplateConfigure.cs
@@ -42,6 +42,7 @@ namespace Shentun.WebPeis.Configures
             entity.Property(e => e.PmStartTime).HasColumnName("pm_start_time");
             entity.Property(e => e.PmStopTime).HasColumnName("pm_stop_time");
             entity.Property(e => e.WeekId).IsRequired().HasColumnName("week_id");
+            entity.Property(e => e.SingleNumberLimit).IsRequired().HasColumnName("single_number_limit");
         }
     }
 }