From 8ab14bc131c1075856c2e7a1ccdc5cce6608ab63 Mon Sep 17 00:00:00 2001
From: xiaochanghai <xiaochanghai@foxmail.com>
Date: Tue, 1 Apr 2025 17:55:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=E6=A8=A1=E6=9D=BF=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=AF=B9=E5=BA=94=E8=AF=BE=E7=A8=8B=E6=8C=89=E7=85=A7?=
 =?UTF-8?q?=E4=B8=80=E7=AC=94=E9=A2=98=E7=9B=AE=E5=AF=B9=E4=B8=80=E7=AC=94?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AF=BC=E5=85=A5=EF=BC=8C=E7=9B=B8=E5=90=8C?=
 =?UTF-8?q?=E8=AF=95=E9=A2=98=EF=BC=88=E9=A2=98=E7=9B=AE=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E3=80=81=E9=9A=BE=E6=98=93=E7=A8=8B=E5=BA=A6=E3=80=81=E9=A2=98?=
 =?UTF-8?q?=E7=9B=AE=E5=86=85=E5=AE=B9=E4=B8=80=E8=87=B4=E6=89=8D=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E4=B8=BA=E7=9B=B8=E5=90=8C=EF=BC=89=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E4=B8=8D=E5=90=8C=E8=AF=BE=E7=A8=8B=E6=97=B6=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=90=8E=E8=A6=81=E5=9C=A8=E5=90=8C=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=8D=95=E5=85=83=E6=A0=BC=E4=B8=AD=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ghre/Ghre_QuestionServices.cs             | 42 +++++++++++++++----
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs b/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs
index b72d5aec..c6006763 100644
--- a/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs
+++ b/Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs
@@ -879,6 +879,7 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
             var x = types[jj];
 
             string questionType = ConvertQuestionType1(x);
+            string difficultyLevel = string.Empty;
             try
             {
                 var dt = NPOIHelper.ImportExcel(filepath, x);
@@ -913,6 +914,7 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
                     if (string.IsNullOrEmpty(questionContent))
                         comments.Add("题目内容为必填项！");
 
+
                     if (courseName.IsNullOrEmpty())
                         comments.Add("课程为必填项！");
                     else
@@ -936,7 +938,6 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
                         correctAnswer = dt.Rows[i]["正确答案"].ToString();
                     if (string.IsNullOrWhiteSpace(correctAnswer) && questionType != "Completion" && questionType != "ShortAnswer")
                         comments.Add("正确答案未标记！");
-                    var difficultyLevel = dt.Rows[i]["难度"].ToString() ?? "普通";
                     var questionAnalysis = dt.Rows[i]["解析"].ToString();
                     if (string.IsNullOrWhiteSpace(difficultyLevel))
                         comments.Add("难易程度必填！");
@@ -971,19 +972,24 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
                         correctAnswer = dt.Rows[i]["正确答案"].ToString();
 
                     var questionAnalysis = dt.Rows[i]["解析"].ToString();
-                    var difficultyLevel = dt.Rows[i]["难度"].ToString() ?? "普通";
+                    difficultyLevel = dt.Rows[i]["难度"].ToString() ?? "普通";
+
+                    difficultyLevel = ConvertDifficultyLevel1(difficultyLevel);
 
                     Ghre_CourseDto course = await _ghre_CourseServices.QuerySingleDto(x => x.CourseName == courseName);
 
-                    var question = await base.Query(x => x.QuestionContent == questionContent && x.QuestionType == questionType && x.CourseId == course.Id);
+                    var question = await base.Query(x =>
+                    x.QuestionContent == questionContent &&
+                    x.DifficultyLevel == difficultyLevel &&
+                    x.QuestionType == questionType);
                     if (!question.Any())
                     {
-
                         var insert = new InsertGhre_QuestionInput()
                         {
                             CourseId = course?.Id,
+                            CourseIds = "[" + course?.Id + "]",
                             QuestionNo = await GenerateContinuousSequence(questionType.Substring(0, 1)),
-                            DifficultyLevel = ConvertDifficultyLevel1(difficultyLevel),
+                            DifficultyLevel = difficultyLevel,
                             QuestionType = questionType,
                             QuestionContent = questionContent,
                             QuestionAnalysis = questionAnalysis
@@ -1127,10 +1133,28 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
                     }
                     else
                     {
-                        dt.Rows[i]["Comments"] = "试题在系统中已存在！";
-                        data.ErrorCount++;
-                        isExistError = true;
-                        continue;
+
+                        if (question.Where(x => x.CourseIds != null && x.CourseIds.Contains(course.Id.ObjToString())).Any())
+                        {
+                            dt.Rows[i]["Comments"] = "试题在系统中已存在！";
+                            data.ErrorCount++;
+                            isExistError = true;
+                            continue;
+                        }
+                        else
+                        {
+                            var coursIds = question.FirstOrDefault()?.CourseIds;
+                            var coursIds1 = new List<long>();
+                            if (coursIds.IsNotEmptyOrNull())
+                                coursIds1 = JsonHelper.JsonToObj<List<long>>(coursIds);
+                            coursIds1.Add(course.Id);
+
+
+                            var question1 = question.FirstOrDefault();
+                            question1.CourseIds = JsonHelper.ObjToJson(coursIds1);
+                            await base.Update(question1, ["CourseIds"]);
+                        }
+
                     }
                 }