From 897b1cea051106dfa8da80763163e7811cc3c909 Mon Sep 17 00:00:00 2001 From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com> Date: Thu, 13 Jun 2024 00:26:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QuestionRegisterAppService.cs | 4 +++- .../Models/DiseaseRiskLevelAsbitem.cs | 9 ++++++++- src/Shentun.WebPeis.Domain/Models/Question.cs | 16 ++++++++-------- .../Models/QuestionAnswer.cs | 7 ------- .../Models/QuestionAnswerChild.cs | 16 ++++++++-------- .../Models/QuestionRegisterAnswer.cs | 17 +++++++++-------- .../Models/QuestionRegisterAnswerChild.cs | 17 +++++++++-------- .../Models/QuestionRegisterItem.cs | 16 ++++++++-------- .../Models/QuestionType.cs | 17 +++++++++-------- .../DiseaseRiskLevelAsbitemConfigure.cs | 8 ++++++++ 10 files changed, 70 insertions(+), 57 deletions(-) diff --git a/src/Shentun.WebPeis.Application/QuestionRegisters/QuestionRegisterAppService.cs b/src/Shentun.WebPeis.Application/QuestionRegisters/QuestionRegisterAppService.cs index a287724..5b85c9b 100644 --- a/src/Shentun.WebPeis.Application/QuestionRegisters/QuestionRegisterAppService.cs +++ b/src/Shentun.WebPeis.Application/QuestionRegisters/QuestionRegisterAppService.cs @@ -14,7 +14,9 @@ namespace Shentun.WebPeis.QuestionRegisters private readonly IRepository _repository; public QuestionRegisterAppService(IRepository repository) { - + _repository = repository; } + + //public async Task Get } } diff --git a/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevelAsbitem.cs b/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevelAsbitem.cs index 9f99200..51e29a5 100644 --- a/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevelAsbitem.cs +++ b/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevelAsbitem.cs @@ -1,12 +1,14 @@ using System; using System.Collections.Generic; +using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.Domain.Entities; namespace Shentun.WebPeis.Models; /// /// 疾病风险推荐的组合项目 /// -public partial class DiseaseRiskLevelAsbitem +public partial class DiseaseRiskLevelAsbitem : AuditedEntity, IHasConcurrencyStamp { /// /// 疾病风险级别ID @@ -26,4 +28,9 @@ public partial class DiseaseRiskLevelAsbitem public string? ConcurrencyStamp { get; set; } public virtual DiseaseRiskLevel DiseaseRiskLevel { get; set; } = null!; + + public override object?[] GetKeys() + { + return [DiseaseRiskLevelId, AsbitemId]; + } } diff --git a/src/Shentun.WebPeis.Domain/Models/Question.cs b/src/Shentun.WebPeis.Domain/Models/Question.cs index 0f35c8d..228ce53 100644 --- a/src/Shentun.WebPeis.Domain/Models/Question.cs +++ b/src/Shentun.WebPeis.Domain/Models/Question.cs @@ -1,12 +1,14 @@ using System; using System.Collections.Generic; +using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.Domain.Entities; namespace Shentun.WebPeis.Models; /// /// 问卷 /// -public partial class Question +public partial class Question : AuditedEntity, IHasConcurrencyStamp { /// /// 主键 @@ -27,13 +29,6 @@ public partial class Question 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; } /// /// 档案类别 /// @@ -60,4 +55,9 @@ public partial class Question public string? ConcurrencyStamp { get; set; } public virtual ICollection QuestionRegisterItems { get; set; } = new List(); + + public override object?[] GetKeys() + { + return [QuestionId]; + } } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs b/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs index 7bee26c..23e437d 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs @@ -29,13 +29,6 @@ public partial class QuestionAnswer : AuditedEntity, IHasConcurrencyStamp 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; } /// /// 有子答案 /// diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionAnswerChild.cs b/src/Shentun.WebPeis.Domain/Models/QuestionAnswerChild.cs index 32ad517..1142e68 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionAnswerChild.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionAnswerChild.cs @@ -1,12 +1,14 @@ using System; using System.Collections.Generic; +using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.Domain.Entities; namespace Shentun.WebPeis.Models; /// /// 子答案 /// -public partial class QuestionAnswerChild +public partial class QuestionAnswerChild : AuditedEntity, IHasConcurrencyStamp { /// /// 主键 @@ -22,12 +24,10 @@ public partial class QuestionAnswerChild 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 [QuestionAnswerChildId]; + } } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswer.cs b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswer.cs index 7fa37e6..28e98ad 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswer.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswer.cs @@ -1,12 +1,14 @@ using System; using System.Collections.Generic; +using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.Domain.Entities; namespace Shentun.WebPeis.Models; /// /// 预约人员问卷答案 /// -public partial class QuestionRegisterAnswer +public partial class QuestionRegisterAnswer : AuditedEntity, IHasConcurrencyStamp { /// /// 主键 @@ -23,13 +25,7 @@ public partial class QuestionRegisterAnswer public Guid QuestionAnswerId { 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; } @@ -38,4 +34,9 @@ public partial class QuestionRegisterAnswer public virtual ICollection QuestionRegisterAnswerChildren { get; set; } = new List(); public virtual QuestionRegisterItem QuestionRegisterItem { get; set; } = null!; + + public override object?[] GetKeys() + { + return [QuestionRegisterAnswerId]; + } } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswerChild.cs b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswerChild.cs index ff7d109..3b35ffb 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswerChild.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswerChild.cs @@ -1,12 +1,14 @@ using System; using System.Collections.Generic; +using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.Domain.Entities; namespace Shentun.WebPeis.Models; /// /// 预约人员问卷题目子答案 /// -public partial class QuestionRegisterAnswerChild +public partial class QuestionRegisterAnswerChild : AuditedEntity, IHasConcurrencyStamp { /// /// 主键 @@ -23,15 +25,14 @@ public partial class QuestionRegisterAnswerChild public string? Content { 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 virtual QuestionRegisterAnswer QuestionRegisterAnswer { get; set; } = null!; + + public override object?[] GetKeys() + { + return [QuestionRegisterAnswerChildId]; + } } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterItem.cs b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterItem.cs index ca47f83..589f348 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterItem.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterItem.cs @@ -1,12 +1,14 @@ using System; using System.Collections.Generic; +using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.Domain.Entities; namespace Shentun.WebPeis.Models; /// /// 预约人员登记的问卷项目 /// -public partial class QuestionRegisterItem +public partial class QuestionRegisterItem : AuditedEntity, IHasConcurrencyStamp { /// /// 主键 @@ -23,13 +25,6 @@ public partial class QuestionRegisterItem public Guid QuestionId { 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; } @@ -38,4 +33,9 @@ public partial class QuestionRegisterItem public virtual QuestionRegister QuestionRegister { get; set; } = null!; public virtual ICollection QuestionRegisterAnswers { get; set; } = new List(); + + public override object?[] GetKeys() + { + return [QuestionRegisterItemId]; + } } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionType.cs b/src/Shentun.WebPeis.Domain/Models/QuestionType.cs index 7092877..8a30bad 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionType.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionType.cs @@ -1,12 +1,14 @@ using System; using System.Collections.Generic; +using Volo.Abp.Domain.Entities.Auditing; +using Volo.Abp.Domain.Entities; namespace Shentun.WebPeis.Models; /// /// 问卷类别 01-小程序健康问卷 /// -public partial class QuestionType +public partial class QuestionType : AuditedEntity, IHasConcurrencyStamp { /// /// 主键 @@ -22,13 +24,12 @@ public partial class QuestionType 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 [QuestionTypeId]; + } } diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/DiseaseRiskLevelAsbitemConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/DiseaseRiskLevelAsbitemConfigure.cs index d0b466a..9844eff 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/DiseaseRiskLevelAsbitemConfigure.cs +++ b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/DiseaseRiskLevelAsbitemConfigure.cs @@ -21,6 +21,14 @@ namespace Shentun.WebPeis.Configures entity.Property(e => e.DiseaseRiskLevelId).HasColumnName("disease_risk_level_id"); entity.Property(e => e.AsbitemId).HasColumnName("asbitem_id"); entity.Property(e => e.AsbitemRecommendLevelId).HasColumnName("asbitem_recommend_level_id"); + entity.Property(e => e.CreationTime) + .HasColumnType("timestamp(6) without time zone") + .HasColumnName("creation_time"); + entity.Property(e => e.CreatorId).HasColumnName("creator_id"); + entity.Property(e => e.LastModificationTime) + .HasColumnType("timestamp(6) without time zone") + .HasColumnName("last_modification_time"); + entity.Property(e => e.LastModifierId).HasColumnName("last_modifier_id"); entity.Property(e => e.ConcurrencyStamp) .HasMaxLength(40)