代码优化

Tiobon.Core.Api/Tiobon.Core.Model.xml

@@ -618,10 +618,12 @@
             关联类型
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperBase.LinkTimes">
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperBase.LinkId">
             <summary>
             关联ID
             </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperBase.LinkTimes">
             <summary>
             关联次数
             </summary>
@@ -4950,6 +4952,11 @@
             题目ID
             </summary> 
         </member>
+        <member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperPreview.QuestionType">
+            <summary>
+            题目类型
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperPreview.ConfigId">
             <summary>
             试卷配置ID

Tiobon.Core.Api/Tiobon.Core.xml

@@ -655,6 +655,13 @@
             <param name="Id"></param>
             <returns></returns>
         </member>
+        <member name="M:Tiobon.Core.Api.Controllers.Ghre_ExamPaperController.Insert1(Tiobon.Core.Model.DefaultGhre_ExamPaperPageData)">
+            <summary>
+            新增 
+            </summary>
+            <param name="insert"></param>
+            <returns></returns>
+        </member>
         <member name="M:Tiobon.Core.Api.Controllers.Ghre_ExamPaperController.InsertConfig(Tiobon.Core.Model.Models.InsertGhre_ExamPaperConfigInput)">
             <summary>
             新增配置数据

Tiobon.Core.Model/ViewModels/Extend/DefaultGhre_ExamPaperInput.cs

@@ -1,4 +1,6 @@
-using System.Dynamic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel;
+using System.Dynamic;
 using Tiobon.Core.Model.Models;
 
 namespace Tiobon.Core.Model;
@@ -58,11 +60,21 @@ public class DefaultGhre_ExamPaperPreview
     /// </summary> 
     public long QuestionId { get; set; }
 
+    /// <summary>
+    /// 题目类型
+    /// </summary>
+    public string QuestionType { get; set; }
+
+    /// <summary>
+    /// 题目内容
+    /// </summary>
+    public string QuestionContent { get; set; }
+
     /// <summary>
     /// 试卷配置ID
     /// </summary>
     public long? ConfigId { get; set; }
-    public List<FromGhre_QuestionQuestionTypeDetail> detail { get; set; } = new List<FromGhre_QuestionQuestionTypeDetail> { };
+    public FromGhre_QuestionQuestionTypeDetail detail { get; set; } = new FromGhre_QuestionQuestionTypeDetail();
 } 
 public class  InsertExamPaperConfigInput
 {

Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs

@@ -326,19 +326,34 @@ namespace Tiobon.Core.Services
                 previews.ForEach(x =>
                 {
                     var answers1 = answers.Where(y => y.QuestionId == x.QuestionId).ToList();
-                    var detail = questions1.Select(o =>
+
-                    new FromGhre_QuestionQuestionTypeDetail()
+
-                    {
+                    //var detail = questions1.Select(o =>
-                        Id = o.Id,
+                    //new FromGhre_QuestionQuestionTypeDetail()
-                        difficulty = o.DifficultyLevel,
+                    //{
-                        RemarkSz = o.QuestionAnalysis,
+                    //    Id = o.Id,
-                        content = o.QuestionContent,
+                    //    difficulty = o.DifficultyLevel,
-                    }).ToList();
+                    //    RemarkSz = o.QuestionAnalysis,
-                    detail.ForEach(y =>
+                    //    content = o.QuestionContent,
-                    {
+                    //}).ToList();
-                        y.answer = answers1.Where(x => x.IsCorrect == true).FirstOrDefault()?.QuestionNo;
+                    //detail.ForEach(y =>
-                        y.answer1 = answers1.Where(x => x.IsCorrect == true).Select(x => x.QuestionNo).ToList();
+                    //{
-                        y.answerList = answers.Select(x => new FromGhre_QuestionQuestionAnswerList()
+                    //    y.answer = answers1.Where(x => x.IsCorrect == true).FirstOrDefault()?.QuestionNo;
+                    //    y.answer1 = answers1.Where(x => x.IsCorrect == true).Select(x => x.QuestionNo).ToList();
+                    //    y.answerList = answers.Select(x => new FromGhre_QuestionQuestionAnswerList()
+                    //    {
+                    //        No = x.QuestionNo,
+                    //        label = x.AnswerContent,
+                    //        imageUrl = x.ImageUrl,
+                    //        imgWidthPc = x.ImageWidthPc,
+                    //        imgWidthApp = x.ImageWidthApp,
+                    //    }).ToList();
+                    //});
+
+                    var detail = new FromGhre_QuestionQuestionTypeDetail();
+                    detail.answer = answers1.Where(x => x.IsCorrect == true).FirstOrDefault()?.QuestionNo;
+                    detail.answer1 = answers1.Where(x => x.IsCorrect == true).Select(x => x.QuestionNo).ToList();
+                    detail.answerList = answers.Select(x => new FromGhre_QuestionQuestionAnswerList()
                     {
                         No = x.QuestionNo,
                         label = x.AnswerContent,
@@ -346,7 +361,6 @@ namespace Tiobon.Core.Services
                         imgWidthPc = x.ImageWidthPc,
                         imgWidthApp = x.ImageWidthApp,
                     }).ToList();
-                    });
 
                     x.detail = detail;
                 });
@@ -383,6 +397,8 @@ namespace Tiobon.Core.Services
                 Id = x.Id,
                 parentId = parentId,
                 QuestionId = x.Id,
+                QuestionType = x.QuestionType,
+                QuestionContent = x.QuestionContent,
             }).ToList();
             var questionIds = previews.Select(x => x.QuestionId).Distinct().ToList();
             var questions1 = await _ghre_QuestionServices.Query(x => questionIds.Contains(x.Id));
@@ -391,20 +407,10 @@ namespace Tiobon.Core.Services
             previews.ForEach(x =>
             {
                 var answers1 = answers.Where(y => y.QuestionId == x.QuestionId).ToList();
-                var detail = questions1.Select(o =>
+                var detail = new FromGhre_QuestionQuestionTypeDetail();
-                new FromGhre_QuestionQuestionTypeDetail()
+                detail.answer = answers1.Where(x => x.IsCorrect == true).FirstOrDefault()?.QuestionNo;
-                {
+                detail.answer1 = answers1.Where(x => x.IsCorrect == true).Select(x => x.QuestionNo).ToList();
-                    Id = o.Id,
+                detail.answerList = answers1.Select(x => new FromGhre_QuestionQuestionAnswerList()
-                    difficulty = o.DifficultyLevel,
-                    RemarkSz = o.QuestionAnalysis,
-                    content = o.QuestionContent,
-
-                }).ToList();
-                detail.ForEach(y =>
-                {
-                    y.answer = answers1.Where(x => x.IsCorrect == true).FirstOrDefault()?.QuestionNo;
-                    y.answer1 = answers1.Where(x => x.IsCorrect == true).Select(x => x.QuestionNo).ToList();
-                    y.answerList = answers.Select(x => new FromGhre_QuestionQuestionAnswerList()
                 {
                     No = x.QuestionNo,
                     label = x.AnswerContent,
@@ -412,8 +418,7 @@ namespace Tiobon.Core.Services
                     imgWidthPc = x.ImageWidthPc,
                     imgWidthApp = x.ImageWidthApp,
                 }).ToList();
-                });
+                detail.content = x.QuestionContent;
-
                 x.detail = detail;
             });
             input.previewList = previews;

Tiobon.Core/Tiobon.Core.Model.xml

@@ -618,10 +618,12 @@
             关联类型
             </summary>
         </member>
-        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperBase.LinkTimes">
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperBase.LinkId">
             <summary>
             关联ID
             </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.Models.Ghre_ExamPaperBase.LinkTimes">
             <summary>
             关联次数
             </summary>
@@ -4950,6 +4952,16 @@
             题目ID
             </summary> 
         </member>
+        <member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperPreview.QuestionType">
+            <summary>
+            题目类型
+            </summary>
+        </member>
+        <member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperPreview.QuestionContent">
+            <summary>
+            题目内容
+            </summary>
+        </member>
         <member name="P:Tiobon.Core.Model.DefaultGhre_ExamPaperPreview.ConfigId">
             <summary>
             试卷配置ID