From 76726ee91eb598a04221858a8e1696b113af1ec6 Mon Sep 17 00:00:00 2001 From: "DESKTOP-G961P6V\\Zhh" <839860190@qq.com> Date: Thu, 13 Jun 2024 00:11:59 +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 | 20 +++++++++++++++++++ .../Models/AsbitemRecommendLevel.cs | 2 +- .../Models/DiseaseRiskLevelAsbitem.cs | 7 +++++++ src/Shentun.WebPeis.Domain/Models/Question.cs | 1 + .../Models/QuestionAnswer.cs | 10 +++++++++- .../Models/QuestionAnswerChild.cs | 1 + .../Models/QuestionRegister.cs | 20 +++++++++---------- .../Models/QuestionRegisterAnswer.cs | 2 ++ .../Models/QuestionRegisterAnswerChild.cs | 2 ++ .../Models/QuestionRegisterItem.cs | 2 ++ .../Models/QuestionType.cs | 2 ++ .../DiseaseRiskLevelAsbitemConfigure.cs | 5 +++++ .../QuestionAnswerChildConfigure.cs | 3 +++ .../Configures/QuestionAnswerConfigure.cs | 3 +++ .../Configures/QuestionConfigure.cs | 3 +++ .../QuestionRegisterAnswerChildConfigure.cs | 3 +++ .../QuestionRegisterAnswerConfigure.cs | 3 +++ .../Configures/QuestionRegisterConfigure.cs | 4 +++- .../QuestionRegisterItemConfigure.cs | 3 +++ .../Configures/QuestionTypeConfigure.cs | 3 +++ 20 files changed, 86 insertions(+), 13 deletions(-) create mode 100644 src/Shentun.WebPeis.Application/QuestionRegisters/QuestionRegisterAppService.cs diff --git a/src/Shentun.WebPeis.Application/QuestionRegisters/QuestionRegisterAppService.cs b/src/Shentun.WebPeis.Application/QuestionRegisters/QuestionRegisterAppService.cs new file mode 100644 index 0000000..a287724 --- /dev/null +++ b/src/Shentun.WebPeis.Application/QuestionRegisters/QuestionRegisterAppService.cs @@ -0,0 +1,20 @@ +using Shentun.WebPeis.Models; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.Application.Services; +using Volo.Abp.Domain.Repositories; + +namespace Shentun.WebPeis.QuestionRegisters +{ + public class QuestionRegisterAppService:ApplicationService + { + private readonly IRepository _repository; + public QuestionRegisterAppService(IRepository repository) + { + + } + } +} diff --git a/src/Shentun.WebPeis.Domain/Models/AsbitemRecommendLevel.cs b/src/Shentun.WebPeis.Domain/Models/AsbitemRecommendLevel.cs index 17335a4..686eebf 100644 --- a/src/Shentun.WebPeis.Domain/Models/AsbitemRecommendLevel.cs +++ b/src/Shentun.WebPeis.Domain/Models/AsbitemRecommendLevel.cs @@ -10,7 +10,7 @@ namespace Shentun.WebPeis.Models { public class AsbitemRecommendLevel : AuditedEntity, IHasConcurrencyStamp { - public Guid AsbitemRecommendLevelId { get; set; } + public short AsbitemRecommendLevelId { get; set; } public string AsbitemRecommendLevelName { get; set; } = null!; diff --git a/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevelAsbitem.cs b/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevelAsbitem.cs index 7b1bb29..9f99200 100644 --- a/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevelAsbitem.cs +++ b/src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevelAsbitem.cs @@ -17,6 +17,13 @@ public partial class DiseaseRiskLevelAsbitem /// public Guid AsbitemId { get; set; } + /// + /// 推荐组合项目级别 1-一级推荐，2-2级推荐，3-3级推荐 + /// + + public short AsbitemRecommendLevelId { get; set; } + + public string? ConcurrencyStamp { get; set; } public virtual DiseaseRiskLevel DiseaseRiskLevel { get; set; } = null!; } diff --git a/src/Shentun.WebPeis.Domain/Models/Question.cs b/src/Shentun.WebPeis.Domain/Models/Question.cs index 3aefc56..0f35c8d 100644 --- a/src/Shentun.WebPeis.Domain/Models/Question.cs +++ b/src/Shentun.WebPeis.Domain/Models/Question.cs @@ -58,5 +58,6 @@ public partial class Question /// 问卷包含的项目 /// + public string? ConcurrencyStamp { get; set; } public virtual ICollection QuestionRegisterItems { get; set; } = new List(); } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs b/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs index 733a1ef..7bee26c 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionAnswer.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 QuestionAnswer +public partial class QuestionAnswer : AuditedEntity, IHasConcurrencyStamp { /// /// 主键 @@ -56,4 +58,10 @@ public partial class QuestionAnswer public Guid? DiseaseRiskLevelId { get; set; } public virtual ICollection QuestionRegisterAnswers { get; set; } = new List(); + public string? ConcurrencyStamp { get; set; } + + public override object?[] GetKeys() + { + return [QuestionAnswerId]; + } } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionAnswerChild.cs b/src/Shentun.WebPeis.Domain/Models/QuestionAnswerChild.cs index 2e14e49..32ad517 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionAnswerChild.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionAnswerChild.cs @@ -29,4 +29,5 @@ public partial class QuestionAnswerChild public DateTime LastModificationTime { get; set; } public Guid LastModifierId { get; set; } + public string? ConcurrencyStamp { get; set; } } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionRegister.cs b/src/Shentun.WebPeis.Domain/Models/QuestionRegister.cs index d167361..a2c4a83 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionRegister.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionRegister.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 QuestionRegister +public partial class QuestionRegister: AuditedEntity, IHasConcurrencyStamp { /// /// 主键 @@ -18,15 +20,7 @@ public partial class QuestionRegister public Guid PersonId { get; set; } - - - public DateTime CreationTime { get; set; } - - public Guid CreatorId { get; set; } - - public DateTime LastModificationTime { get; set; } - - public Guid LastModifierId { get; set; } + public virtual Person Person { get; set; } = null!; /// @@ -34,4 +28,10 @@ public partial class QuestionRegister /// public virtual ICollection QuestionRegisterItems { get; set; } = new List(); + public string? ConcurrencyStamp { get; set; } + + public override object?[] GetKeys() + { + return [QuestionRegisterId]; + } } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswer.cs b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswer.cs index b00bdb5..7fa37e6 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswer.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswer.cs @@ -31,6 +31,8 @@ public partial class QuestionRegisterAnswer public Guid LastModifierId { get; set; } + public string? ConcurrencyStamp { get; set; } + public virtual QuestionAnswer QuestionAnswer { get; set; } = null!; public virtual ICollection QuestionRegisterAnswerChildren { get; set; } = new List(); diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswerChild.cs b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswerChild.cs index 11d3f51..ff7d109 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswerChild.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterAnswerChild.cs @@ -31,5 +31,7 @@ public partial class QuestionRegisterAnswerChild public Guid LastModifierId { get; set; } + public string? ConcurrencyStamp { get; set; } + public virtual QuestionRegisterAnswer QuestionRegisterAnswer { get; set; } = null!; } diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterItem.cs b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterItem.cs index 8cef154..ca47f83 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionRegisterItem.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionRegisterItem.cs @@ -31,6 +31,8 @@ public partial class QuestionRegisterItem public Guid LastModifierId { get; set; } + public string? ConcurrencyStamp { get; set; } + public virtual Question Question { get; set; } = null!; public virtual QuestionRegister QuestionRegister { get; set; } = null!; diff --git a/src/Shentun.WebPeis.Domain/Models/QuestionType.cs b/src/Shentun.WebPeis.Domain/Models/QuestionType.cs index 0fca364..7092877 100644 --- a/src/Shentun.WebPeis.Domain/Models/QuestionType.cs +++ b/src/Shentun.WebPeis.Domain/Models/QuestionType.cs @@ -29,4 +29,6 @@ public partial class QuestionType public DateTime LastModificationTime { get; set; } public Guid LastModifierId { get; set; } + + public string? ConcurrencyStamp { get; set; } } diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/DiseaseRiskLevelAsbitemConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/DiseaseRiskLevelAsbitemConfigure.cs index 7632f84..d0b466a 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/DiseaseRiskLevelAsbitemConfigure.cs +++ b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/DiseaseRiskLevelAsbitemConfigure.cs @@ -20,6 +20,11 @@ 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.ConcurrencyStamp) + .HasMaxLength(40) + .HasColumnName("concurrency_stamp"); entity.HasOne(d => d.DiseaseRiskLevel).WithMany(p => p.DiseaseRiskLevelAsbitems) .HasForeignKey(d => d.DiseaseRiskLevelId) diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionAnswerChildConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionAnswerChildConfigure.cs index d1af91a..f05d850 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionAnswerChildConfigure.cs +++ b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionAnswerChildConfigure.cs @@ -40,6 +40,9 @@ namespace Shentun.WebPeis.Configures entity.Property(e => e.SimpleCode) .HasMaxLength(20) .HasColumnName("simple_code"); + entity.Property(e => e.ConcurrencyStamp) + .HasMaxLength(40) + .HasColumnName("concurrency_stamp"); } } } diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionAnswerConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionAnswerConfigure.cs index b3e2daa..560fa20 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionAnswerConfigure.cs +++ b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionAnswerConfigure.cs @@ -37,6 +37,9 @@ namespace Shentun.WebPeis.Configures entity.Property(e => e.SimpleCode) .HasMaxLength(20) .HasColumnName("simple_code"); + entity.Property(e => e.ConcurrencyStamp) + .HasMaxLength(40) + .HasColumnName("concurrency_stamp"); } } } diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionConfigure.cs index 15372dc..d905753 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionConfigure.cs +++ b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionConfigure.cs @@ -51,6 +51,9 @@ namespace Shentun.WebPeis.Configures entity.Property(e => e.SimpleCode) .HasMaxLength(20) .HasColumnName("simple_code"); + entity.Property(e => e.ConcurrencyStamp) + .HasMaxLength(40) + .HasColumnName("concurrency_stamp"); } } } diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterAnswerChildConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterAnswerChildConfigure.cs index 336f0dd..4175cae 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterAnswerChildConfigure.cs +++ b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterAnswerChildConfigure.cs @@ -33,6 +33,9 @@ namespace Shentun.WebPeis.Configures .HasColumnName("last_modification_time"); entity.Property(e => e.LastModifierId).HasColumnName("last_modifier_id"); entity.Property(e => e.QuestionRegisterAnswerId).HasColumnName("question_register_answer_id"); + entity.Property(e => e.ConcurrencyStamp) + .HasMaxLength(40) + .HasColumnName("concurrency_stamp"); entity.HasOne(d => d.QuestionRegisterAnswer).WithMany(p => p.QuestionRegisterAnswerChildren) .HasForeignKey(d => d.QuestionRegisterAnswerId) diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterAnswerConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterAnswerConfigure.cs index 5fe8e3a..2c6fc01 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterAnswerConfigure.cs +++ b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterAnswerConfigure.cs @@ -35,6 +35,9 @@ namespace Shentun.WebPeis.Configures entity.Property(e => e.LastModifierId).HasColumnName("last_modifier_id"); entity.Property(e => e.QuestionAnswerId).HasColumnName("question_answer_id"); entity.Property(e => e.QuestionRegisterItemId).HasColumnName("question_register_item_id"); + entity.Property(e => e.ConcurrencyStamp) + .HasMaxLength(40) + .HasColumnName("concurrency_stamp"); entity.HasOne(d => d.QuestionAnswer).WithMany(p => p.QuestionRegisterAnswers) .HasForeignKey(d => d.QuestionAnswerId) diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterConfigure.cs index a6f4e27..15ab074 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterConfigure.cs +++ b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterConfigure.cs @@ -32,7 +32,9 @@ namespace Shentun.WebPeis.Configures .HasColumnName("last_modification_time"); entity.Property(e => e.LastModifierId).HasColumnName("last_modifier_id"); entity.Property(e => e.PersonId).HasColumnName("person_id"); - + entity.Property(e => e.ConcurrencyStamp) + .HasMaxLength(40) + .HasColumnName("concurrency_stamp"); entity.HasOne(d => d.Person).WithMany(p => p.QuestionRegisters) .HasForeignKey(d => d.PersonId) .OnDelete(DeleteBehavior.ClientSetNull) diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterItemConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterItemConfigure.cs index 20eb4b0..4368f60 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterItemConfigure.cs +++ b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionRegisterItemConfigure.cs @@ -35,6 +35,9 @@ namespace Shentun.WebPeis.Configures entity.Property(e => e.LastModifierId).HasColumnName("last_modifier_id"); entity.Property(e => e.QuestionId).HasColumnName("question_id"); entity.Property(e => e.QuestionRegisterId).HasColumnName("question_register_id"); + entity.Property(e => e.ConcurrencyStamp) + .HasMaxLength(40) + .HasColumnName("concurrency_stamp"); entity.HasOne(d => d.Question).WithMany(p => p.QuestionRegisterItems) .HasForeignKey(d => d.QuestionId) diff --git a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionTypeConfigure.cs b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionTypeConfigure.cs index 1254f86..d722c34 100644 --- a/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionTypeConfigure.cs +++ b/src/Shentun.WebPeis.EntityFrameworkCore/Configures/QuestionTypeConfigure.cs @@ -38,6 +38,9 @@ namespace Shentun.WebPeis.Configures entity.Property(e => e.SimpleCode) .HasMaxLength(20) .HasColumnName("simple_code"); + entity.Property(e => e.ConcurrencyStamp) + .HasMaxLength(40) + .HasColumnName("concurrency_stamp"); } } }