Merge branch 'master' of http://140.143.162.39:3000/wxd/WebPeis0523

src/Shentun.WebPeis.Domain/Models/AsbitemRecommendLevel.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Entities.Auditing;
+
+namespace Shentun.WebPeis.Models
+{
+    public class AsbitemRecommendLevel : AuditedEntity, IHasConcurrencyStamp
+    {
+        public Guid AsbitemRecommendLevelId { get; set; }
+
+        public string AsbitemRecommendLevelName { get; set; } = null!;
+
+        public string SimpleCode { get; set; } = null!;
+
+        public int DisplayOrder { get; set; }
+
+        public string? ConcurrencyStamp { get; set; }
+
+
+        public override object?[] GetKeys()
+        {
+            return [AsbitemRecommendLevelId];
+        }
+    }
+}

src/Shentun.WebPeis.Domain/Models/DiseaseRisk.cs

@@ -1,9 +1,12 @@
 using System;
 using System.Collections.Generic;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Domain.Entities;
+using NPOI.OpenXmlFormats.Dml;
 
 namespace Shentun.WebPeis.Models;
 
-public partial class DiseaseRisk
+public partial class DiseaseRisk : AuditedEntity, IHasConcurrencyStamp
 {
     public Guid DiseaseRiskId { get; set; }
 
@@ -13,13 +16,14 @@ public partial class DiseaseRisk
 
     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 virtual ICollection<DiseaseRiskLevel> DiseaseRiskLevels { get; set; } = new List<DiseaseRiskLevel>();
+
+    public override object?[] GetKeys()
+    {
+        return [DiseaseRiskId];
+    }
 }

src/Shentun.WebPeis.Domain/Models/DiseaseRiskLevel.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using Volo.Abp.Domain.Entities.Auditing;
+using Volo.Abp.Domain.Entities;
 
 namespace Shentun.WebPeis.Models;
 
-public partial class DiseaseRiskLevel
+public partial class DiseaseRiskLevel : AuditedEntity, IHasConcurrencyStamp
 {
     public Guid DiseaseRiskLevelId { get; set; }
 
@@ -15,13 +17,7 @@ public partial class DiseaseRiskLevel
 
     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 short? DiseaseRiskNormalLevelId { get; set; }
 
@@ -31,5 +27,12 @@ public partial class DiseaseRiskLevel
 
     public virtual DiseaseRisk DiseaseRisk { get; set; } = null!;
 
+    public string? ConcurrencyStamp { get; set; }
+
     public virtual ICollection<DiseaseRiskLevelAsbitem> DiseaseRiskLevelAsbitems { get; set; } = new List<DiseaseRiskLevelAsbitem>();
+
+    public override object?[] GetKeys()
+    {
+        return [DiseaseRiskLevelId];
+    }
 }

src/Shentun.WebPeis.EntityFrameworkCore/Configures/AsbitemRecommendLevelConfigure.cs

@@ -0,0 +1,48 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Shentun.WebPeis.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.Domain.Entities;
+
+namespace Shentun.WebPeis.Configures
+{
+    public class AsbitemRecommendLevelConfigure : IEntityTypeConfiguration<AsbitemRecommendLevel>
+    {
+        public void Configure(EntityTypeBuilder<AsbitemRecommendLevel> entity)
+        {
+            entity.HasKey(e => e.AsbitemRecommendLevelId).HasName("pk_asbitem_recommend_level");
+
+            entity.ToTable("asbitem_recommend_level");
+
+            entity.HasIndex(e => e.AsbitemRecommendLevelName, "ix_asbitem_recommend_level").IsUnique();
+
+            entity.Property(e => e.AsbitemRecommendLevelId)
+                .ValueGeneratedNever()
+                .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.AsbitemRecommendLevelName)
+                .HasMaxLength(20)
+                .HasColumnName("asbitem_recommend_level_name");
+            entity.Property(e => e.DisplayOrder)
+                .HasDefaultValue(999999)
+                .HasColumnName("display_order");
+            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.SimpleCode)
+                .HasMaxLength(20)
+                .HasColumnName("simple_code");
+            entity.Property(e => e.ConcurrencyStamp)
+                .HasMaxLength(40)
+                .HasColumnName("concurrency_stamp");
+        }
+    }
+}

src/Shentun.WebPeis.EntityFrameworkCore/Configures/DiseaseRiskConfigure.cs

@@ -40,6 +40,10 @@ namespace Shentun.WebPeis.Configures
             entity.Property(e => e.SimpleCode)
                 .HasMaxLength(20)
                 .HasColumnName("simple_code");
+
+            entity.Property(e => e.ConcurrencyStamp)
+                .HasMaxLength(40)
+                .HasColumnName("concurrency_stamp");
         }
     }
 }

src/Shentun.WebPeis.EntityFrameworkCore/Configures/DiseaseRiskLevelConfigure.cs

@@ -53,6 +53,10 @@ namespace Shentun.WebPeis.Configures
                 .HasForeignKey(d => d.DiseaseRiskId)
                 .OnDelete(DeleteBehavior.ClientSetNull)
                 .HasConstraintName("fk_disease_risk_level");
+
+            entity.Property(e => e.ConcurrencyStamp)
+               .HasMaxLength(40)
+               .HasColumnName("concurrency_stamp");
         }
     }
 }