Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs

@@ -1620,7 +1620,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid SystemCriterionId { get; set; }
 
 
-        public string Type { get; set; }
+        public string Type { get; set; } = string.Empty;
+
+        public List<string> TypeList { get; set; } = new List<string>();
+
+
 
     }
 
@@ -1630,7 +1634,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid TrialCriterionId { get; set; }
 
 
-        public string Type { get; set; }
+        public string Type { get; set; } = string.Empty;
 
         public List<string> TypeList { get; set; } = new List<string>();
 

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs

@@ -139,6 +139,7 @@ namespace IRaCIS.Core.Application.Service
 
          .Where(x => x.ReadingQuestionCriterionSystemId == inDto.SystemCriterionId)
          .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
+         .WhereIf(inDto.TypeList.Count() > 0, x => inDto.TypeList.Contains(x.Type))
          .OrderBy(x => x.ShowOrder)
          .Select(x => new GetCalculateQuestionsOutDto
          ()

IRaCIS.Core.Infra.EFCore/Migrations/20241024011550_question202410240915.cs

@@ -0,0 +1,62 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class question202410240915 : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "ClassifyType",
+                table: "ReadingTableQuestionTrial",
+                type: "int",
+                nullable: true,
+                comment: "分类类型");
+
+            migrationBuilder.AddColumn<int>(
+                name: "ClassifyType",
+                table: "ReadingTableQuestionSystem",
+                type: "int",
+                nullable: true,
+                comment: "分类类型");
+
+            migrationBuilder.AddColumn<int>(
+                name: "ClassifyType",
+                table: "ReadingQuestionTrial",
+                type: "int",
+                nullable: true,
+                comment: "分类类型");
+
+            migrationBuilder.AddColumn<int>(
+                name: "ClassifyType",
+                table: "ReadingQuestionSystem",
+                type: "int",
+                nullable: true,
+                comment: "分类类型");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ClassifyType",
+                table: "ReadingTableQuestionTrial");
+
+            migrationBuilder.DropColumn(
+                name: "ClassifyType",
+                table: "ReadingTableQuestionSystem");
+
+            migrationBuilder.DropColumn(
+                name: "ClassifyType",
+                table: "ReadingQuestionTrial");
+
+            migrationBuilder.DropColumn(
+                name: "ClassifyType",
+                table: "ReadingQuestionSystem");
+        }
+    }
+}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -5479,6 +5479,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasComment("分类问题Id");
 
+                    b.Property<int?>("ClassifyType")
+                        .HasColumnType("int")
+                        .HasComment("分类类型");
+
                     b.Property<int>("ConvertShowType")
                         .HasColumnType("int")
                         .HasComment("转化显示类型");
@@ -5729,6 +5733,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasComment("分类问题Id");
 
+                    b.Property<int?>("ClassifyType")
+                        .HasColumnType("int")
+                        .HasComment("分类类型");
+
                     b.Property<int>("ConvertShowType")
                         .HasColumnType("int")
                         .HasComment("转化显示类型");
@@ -6318,6 +6326,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasComment("分类问题表格Id");
 
+                    b.Property<int?>("ClassifyType")
+                        .HasColumnType("int")
+                        .HasComment("分类类型");
+
                     b.Property<DateTime>("CreateTime")
                         .HasColumnType("datetime2");
 
@@ -6512,6 +6524,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasComment("分类问题表格Id");
 
+                    b.Property<int?>("ClassifyType")
+                        .HasColumnType("int")
+                        .HasComment("分类类型");
+
                     b.Property<DateTime>("CreateTime")
                         .HasColumnType("datetime2");