修改冲突

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -9537,11 +9537,6 @@
             导出标识
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ExportResult">
-            <summary>
-            导出结果
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.GroupName">
             <summary>
             分组
@@ -10147,11 +10142,6 @@
             导出标识
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ExportResult">
-            <summary>
-            导出结果
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionSystemInDto.ValueType">
             <summary>
             数值类型
@@ -10352,11 +10342,6 @@
             导出标识
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.ExportResult">
-            <summary>
-            导出结果
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionTrialInDto.HighlightAnswer">
             <summary>
             高亮问题的答案
@@ -11346,6 +11331,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingQuestionService.GetSystemCalculateQuestions(IRaCIS.Core.Application.Service.Reading.Dto.GetSystemCalculateQuestionsInDto)">
+            <summary>
+            获取系统计算问题
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingQuestionService.GetCalculateTableQuestions(IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateTableQuestionsInDto)">
             <summary>
             获取表格问题
@@ -11353,6 +11345,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.ReadingQuestionService.GetSystemCalculateTableQuestions(IRaCIS.Core.Application.Service.Reading.Dto.GetCalculateTableQuestionsInDto)">
+            <summary>
+            获取系统表格问题
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ReadingQuestionService.GetSystemGroupNameList(IRaCIS.Core.Application.Service.Reading.Dto.GetTrialGroupNameListInDto)">
             <summary>
             获取系统问题分组

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

@@ -1,5 +1,7 @@
 using IRaCIS.Core.Domain.Share;
+using Newtonsoft.Json;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace IRaCIS.Core.Application.Service.Reading.Dto
 {
@@ -850,10 +852,27 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ExportIdentification? ExportIdentification { get; set; }
 
-        /// <summary>
+        [Comment("导出结果")]
-        /// 导出结果
+        public string ExportResultStr { get; set; } = "[]";
-        /// </summary>
+
-        public ExportResult? ExportResult { get; set; }
+        [NotMapped]
+        public List<ExportResult> ExportResult
+        {
+            get
+            {
+                try
+                {
+                    var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
+                    return result == null ? new List<ExportResult>() : result;
+                }
+                catch (Exception)
+                {
+
+                    return new List<ExportResult>();
+                }
+
+            }
+        }
 
         /// <summary>
         /// 分组
@@ -1124,8 +1143,25 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         [Comment("导出标识")]
         public ExportIdentification? ExportIdentification { get; set; }
 
-        [Comment("导出结果")]
+        public string ExportResultStr { get; set; } = "[]";
-        public ExportResult? ExportResult { get; set; }
+
+        public List<ExportResult> ExportResult
+        {
+            get
+            {
+                try
+                {
+                    var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
+                    return result == null ? new List<ExportResult>() : result;
+                }
+                catch (Exception)
+                {
+
+                    return new List<ExportResult>();
+                }
+
+            }
+        }
 
         /// <summary>
         /// 数值类型
@@ -1520,6 +1556,18 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         [NotDefault]
         public Guid TrialReadingCriterionId { get; set; }
     }
+
+
+    public class GetSystemCalculateQuestionsInDto
+    {
+        [NotDefault]
+        public Guid SystemCriterionId { get; set; }
+
+
+        public string Type { get; set; }
+
+    }
+
     public class GetCalculateQuestionsInDto
     {
         [NotDefault]
@@ -1673,10 +1721,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ExportIdentification? ExportIdentification { get; set; }
 
-        /// <summary>
+
-        /// 导出结果
+        [Comment("导出结果")]
-        /// </summary>
+        public string ExportResultStr { get; set; } = "[]";
-        public ExportResult? ExportResult { get; set; }
+
+        public List<ExportResult> ExportResult { get; set; } = new List<ExportResult>();
 
         /// <summary>
         /// 数值类型
@@ -1901,10 +1950,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ExportIdentification? ExportIdentification { get; set; }
 
-        /// <summary>
+        [Comment("导出结果")]
-        /// 导出结果
+        public string ExportResultStr { get; set; } = "[]";
-        /// </summary>
+
-        public ExportResult? ExportResult { get; set; }
+        public List<ExportResult> ExportResult { get; set; } = new List<ExportResult>();
+    
+
 
         public bool IsAdditional { get; set; }
 

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

@@ -126,6 +126,50 @@ namespace IRaCIS.Core.Application.Service
             return result;
         }
 
+        /// <summary>
+        /// 获取系统计算问题
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<List<GetCalculateQuestionsOutDto>> GetSystemCalculateQuestions(GetSystemCalculateQuestionsInDto inDto)
+        {
+            var result = await _readingQuestionSystemRepository
+
+         .Where(x => x.ReadingQuestionCriterionSystemId == inDto.SystemCriterionId)
+          .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
+         .OrderBy(x => x.ShowOrder)
+         .Select(x => new GetCalculateQuestionsOutDto
+         ()
+         {
+             QuestionId = x.Id,
+             QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us)
+
+         }).ToListAsync();
+
+            var tablequestion = await _readingTableQuestionSystemRepository.Where(x => x.SystemCriterionId == inDto.SystemCriterionId && x.Type == "number").Select(x =>
+                   new
+                   {
+                       QuestionId = x.Id,
+                       x.ReadingQuestionId,
+                       QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us)
+                   }).ToListAsync();
+
+
+            result.ForEach(x =>
+            {
+                x.TableQuestions = tablequestion.Where(y => x.QuestionId == y.ReadingQuestionId).Select(y => new CalculateQuestion()
+                {
+
+                    QuestionId = y.QuestionId,
+                    QuestionName = y.QuestionName
+
+                }).ToList();
+            });
+
+            return result;
+        }
+
 
         /// <summary>
         /// 获取表格问题
@@ -152,7 +196,30 @@ namespace IRaCIS.Core.Application.Service
             return result;
         }
 
+        /// <summary>
+        /// 获取系统表格问题
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<List<GetCalculateTableQuestionsOutDto>> GetSystemCalculateTableQuestions(GetCalculateTableQuestionsInDto inDto)
+        {
 
+            var result = await _readingTableQuestionSystemRepository
+
+         .Where(x => x.ReadingQuestionId == inDto.QuestionId)
+           .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type == inDto.Type)
+         .OrderBy(x => x.ShowOrder)
+         .Select(x => new GetCalculateTableQuestionsOutDto
+         ()
+         {
+             QuestionId = x.Id,
+             QuestionName = x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us)
+
+         }).ToListAsync();
+
+            return result;
+        }
 
 
         #endregion
@@ -233,6 +300,8 @@ namespace IRaCIS.Core.Application.Service
         {
             indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
             indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
+
+            indto.ExportResultStr = JsonConvert.SerializeObject(indto.ExportResult);
             indto.HighlightAnswer = JsonConvert.SerializeObject(indto.HighlightAnswerList);
             if (indto.Id != null)
             {
@@ -398,6 +467,7 @@ namespace IRaCIS.Core.Application.Service
                 throw new BusinessValidationFailedException(_localizer["ReadingQuestion_IdDup"]);
             }
             indto.ParentTriggerValue = string.Join(',', indto.ParentTriggerValueList);
+            indto.ExportResultStr = JsonConvert.SerializeObject(indto.ExportResult);
             indto.RelevanceValue = string.Join(',', indto.RelevanceValueList);
             indto.HighlightAnswer = JsonConvert.SerializeObject(indto.HighlightAnswerList);
 

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionSystem.cs

@@ -195,5 +195,24 @@ public class ReadingQuestionSystem : BaseAddAuditEntity
     public ExportIdentification? ExportIdentification { get; set; }
 
     [Comment("导出结果")]
-    public ExportResult? ExportResult { get; set; }
+    public string ExportResultStr { get; set; } = "[]";
+
+    [NotMapped]
+    public List<ExportResult> ExportResult
+    {
+        get
+        {
+            try
+            {
+                var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
+                return result == null ? new List<ExportResult>() : result;
+            }
+            catch (Exception)
+            {
+
+                return new List<ExportResult>();
+            }
+
+        }
+    }
 }

IRaCIS.Core.Domain/Reading/ReadingCriterionQuestion/ReadingQuestionTrial.cs

@@ -260,7 +260,26 @@ public class ReadingQuestionTrial : BaseAddAuditEntity
     public ExportIdentification? ExportIdentification { get; set; }
 
     [Comment("导出结果")]
-    public ExportResult? ExportResult { get; set; }
+    public string ExportResultStr { get; set; } = "[]";
+
+    [NotMapped]
+    public List<ExportResult> ExportResult
+    {
+        get
+        {
+            try
+            {
+                var result = JsonConvert.DeserializeObject<List<ExportResult>>(this.ExportResultStr);
+                return result == null ? new List<ExportResult>() : result;
+            }
+            catch (Exception)
+            {
+
+                return new List<ExportResult>();
+            }
+
+        }
+    }
 }
 public class CalculateInfo
 {

IRaCIS.Core.Infra.EFCore/Migrations/20241015023351_init.cs

@@ -0,0 +1,66 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class init : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ExportResult",
+                table: "ReadingQuestionTrial");
+
+            migrationBuilder.DropColumn(
+                name: "ExportResult",
+                table: "ReadingQuestionSystem");
+
+            migrationBuilder.AddColumn<string>(
+                name: "ExportResultStr",
+                table: "ReadingQuestionTrial",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                defaultValue: "[]",
+                comment: "导出结果");
+
+            migrationBuilder.AddColumn<string>(
+                name: "ExportResultStr",
+                table: "ReadingQuestionSystem",
+                type: "nvarchar(400)",
+                maxLength: 400,
+                nullable: false,
+                defaultValue: "[]",
+                comment: "导出结果");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "ExportResultStr",
+                table: "ReadingQuestionTrial");
+
+            migrationBuilder.DropColumn(
+                name: "ExportResultStr",
+                table: "ReadingQuestionSystem");
+
+            migrationBuilder.AddColumn<int>(
+                name: "ExportResult",
+                table: "ReadingQuestionTrial",
+                type: "int",
+                nullable: true,
+                comment: "导出结果");
+
+            migrationBuilder.AddColumn<int>(
+                name: "ExportResult",
+                table: "ReadingQuestionSystem",
+                type: "int",
+                nullable: true,
+                comment: "导出结果");
+        }
+    }
+}

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

@@ -5438,8 +5438,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("int")
                         .HasComment("导出标识");
 
-                    b.Property<int?>("ExportResult")
+                    b.Property<string>("ExportResultStr")
-                        .HasColumnType("int")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)")
                         .HasComment("导出结果");
 
                     b.Property<string>("FileType")
@@ -5696,8 +5698,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .HasColumnType("int")
                         .HasComment("导出标识");
 
-                    b.Property<int?>("ExportResult")
+                    b.Property<string>("ExportResultStr")
-                        .HasColumnType("int")
+                        .IsRequired()
+                        .HasMaxLength(400)
+                        .HasColumnType("nvarchar(400)")
                         .HasComment("导出结果");
 
                     b.Property<string>("FileType")