From 5cbc1a71a47696c9ca4f51a491f235a278ad9417 Mon Sep 17 00:00:00 2001
From: HK <461671400@qq.com>
Date: Wed, 11 Aug 2021 11:01:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Edu.Model/Entity/Exam/RB_Examination_Paper.cs |  5 +++++
 Edu.Module.Exam/PaperModule.cs                | 15 +++++++++++++--
 Edu.WebApi/Controllers/Exam/ExamController.cs |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Edu.Model/Entity/Exam/RB_Examination_Paper.cs b/Edu.Model/Entity/Exam/RB_Examination_Paper.cs
index 72c7f5f8..88d92e95 100644
--- a/Edu.Model/Entity/Exam/RB_Examination_Paper.cs
+++ b/Edu.Model/Entity/Exam/RB_Examination_Paper.cs
@@ -62,5 +62,10 @@ namespace Edu.Model.Entity.Exam
 		/// 删除状态
 		/// </summary>
 		public int Status { get; set; }
+
+		/// <summary>
+		/// 组卷类型(1-智能组卷，2-手动组卷，3-智能导入)
+		/// </summary>
+		public int GenerateType { get; set; }
 	}
 }
diff --git a/Edu.Module.Exam/PaperModule.cs b/Edu.Module.Exam/PaperModule.cs
index 27a4fd63..ccd1f985 100644
--- a/Edu.Module.Exam/PaperModule.cs
+++ b/Edu.Module.Exam/PaperModule.cs
@@ -167,7 +167,7 @@ namespace Edu.Module.Exam
             // 定义正则表达式用来匹配 img 标签    
             string str = @"<img\b[^<>]*?\bsrc[\s\t\r\n]*=[\s\t\r\n]*[""']?[\s\t\r\n]*(?<imgUrl>[^\s\t\r\n""'<>]*)[^<>]*?/?[\s\t\r\n]*>";
             var extModel = examination_PaperRepository.GetEntity<RB_Examination_Paper_ViewModel>(PaperId);
-            if (extModel != null&& extModel.PaperId>0)
+            if (extModel != null && extModel.PaperId > 0)
             {
                 extModel.GroupList = GetExaminationGroupListModule(new RB_Examination_Group_ViewModel()
                 {
@@ -177,7 +177,7 @@ namespace Edu.Module.Exam
                 {
                     PaperId = extModel.PaperId
                 });
-                if (extModel.GroupList != null && extModel.GroupList.Count > 0 && detailsList!=null && detailsList.Count>0)
+                if (extModel.GroupList != null && extModel.GroupList.Count > 0 && detailsList != null && detailsList.Count > 0)
                 {
                     foreach (var gItem in extModel.GroupList)
                     {
@@ -222,5 +222,16 @@ namespace Edu.Module.Exam
         {
             return examination_DetailsRepository.Delete(Id) > 0;
         }
+
+        /// <summary>
+        /// 根据分组删除分组和题目
+        /// </summary>
+        /// <param name="GId"></param>
+        /// <returns></returns>
+        public bool RemoveExamnationGroupModule(int GId)
+        {
+            return false;
+        }
+
     }
 }
diff --git a/Edu.WebApi/Controllers/Exam/ExamController.cs b/Edu.WebApi/Controllers/Exam/ExamController.cs
index fc458b3e..7dc6e542 100644
--- a/Edu.WebApi/Controllers/Exam/ExamController.cs
+++ b/Edu.WebApi/Controllers/Exam/ExamController.cs
@@ -80,6 +80,7 @@ namespace Edu.WebApi.Controllers.Exam
                 CreateBy = UserInfo.Id,
                 CreateTime = DateTime.Now,
                 Group_Id = base.UserInfo.Group_Id,
+                GenerateType=base.ParmJObj.GetInt("GenerateType"),
             };
             extModel.GroupList = new List<RB_Examination_Group_ViewModel>();
             string groups = base.ParmJObj.GetStringValue("GroupList");
-- 
2.18.1