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 +/// +/// 预约计划主表 +/// +public partial class AppointSchedule : AuditedEntity, IHasConcurrencyStamp { + /// + /// 预约日期 + /// public DateTime? AppointDate { get; set; } + /// + /// 上午数量限制 + /// public int AmNumberLimit { get; set; } + /// + /// 下午数量限制 + /// public int PmNumberLimit { get; set; } + /// + /// 个人体检数量限制 + /// - 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; } + /// + /// 主键 + /// public Guid AppointScheduleId { get; set; } public virtual ICollection AppointScheduleTimes { get; set; } = new List(); + + 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 +/// +/// 单位预约计划 +/// +public partial class AppointScheduleCustomerOrg : AuditedEntity, IHasConcurrencyStamp { + /// + /// 主键 + /// public Guid AppointScheduleCustomerOrgId { get; set; } + /// + /// 单位ID + /// public Guid CustomerOrgId { get; set; } + /// + /// 开始日期 + /// public DateTime? StartDate { get; set; } + /// + /// 结束日期 + /// public DateTime? StopDate { get; set; } + /// + /// 数量限制 + /// 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 +/// +/// 预约计划模板 +/// +public partial class AppointScheduleTemplate : AuditedEntity, IHasConcurrencyStamp { + /// + /// 主键 + /// public Guid AppointScheduleTemplateId { get; set; } + /// + /// 星期 + /// public int? WeekId { get; set; } + /// + /// 上午数量限制 + /// public int AmNumberLimit { get; set; } + /// + /// 下午数量限制 + /// public int PmNumberLimit { get; set; } + /// + /// 个人体检数量限制 + /// + public int SingleNumberLimit { get; set; } + /// + /// 上午上班时间 + /// public TimeOnly? AmStartTime { get; set; } + /// + /// 上午下班时间 + /// public TimeOnly? AmStopTime { get; set; } + /// + /// 下午上班时间 + /// public TimeOnly? PmStartTime { get; set; } + /// + /// 下午下班时间 + /// 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 +/// +/// 预约计划明细表 +/// +public partial class AppointScheduleTime : AuditedEntity, IHasConcurrencyStamp { + /// + /// 主键 + /// public Guid AppointScheduleTimeId { get; set; } + /// + /// 开始时间 + /// public TimeOnly? StartTime { get; set; } + /// + /// 结束时间 + /// public TimeOnly? StopTime { get; set; } + /// + /// 数量限制 + /// public int? NumberLimit { get; set; } + /// + /// 已预约数 + /// 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"); } } }