页面修改

Edu.Module.Exam/PaperModule.cs

@@ -11,6 +11,7 @@ using Edu.Module.Question;
 using Edu.Repository.Question;
 using Edu.Model.ViewModel.Question;
 using System.Text.RegularExpressions;
+using Edu.Model.CacheModel;
 
 namespace Edu.Module.Exam
 {
@@ -488,7 +489,6 @@ 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)
             {
@@ -496,7 +496,7 @@ namespace Edu.Module.Exam
                 extModel.GroupList = GetExaminationGroupListModule(new RB_Examination_Group_ViewModel()
                 {
                     PaperId = extModel.PaperId
-                });
+                })?.OrderBy(qitem => qitem.GSortNum)?.ToList(); 
                 var detailsList = GetExaminationDetailsListModule(new RB_Examination_Details_ViewModel()
                 {
                     PaperId = extModel.PaperId
@@ -505,7 +505,7 @@ namespace Edu.Module.Exam
                 {
                     foreach (var gItem in extModel.GroupList)
                     {
-                        gItem.DetailsList = detailsList?.Where(qitem => qitem.QuestionTypeId == gItem.QuestionTypeId)?.ToList() ?? new List<RB_Examination_Details_ViewModel>();
+                        gItem.DetailsList = detailsList?.Where(qitem => qitem.QuestionTypeId == gItem.QuestionTypeId)?.OrderBy(qitem=>qitem.SortNum)?.ToList() ?? new List<RB_Examination_Details_ViewModel>();
                         if (gItem.DetailsList != null && gItem.DetailsList.Count > 0)
                         {
                             gItem.GScore = gItem?.DetailsList?.Sum(qitem => qitem.Score) ?? 0;
@@ -586,6 +586,7 @@ namespace Edu.Module.Exam
             {
                 flag = examination_DetailsRepository.DeleteOne(new WhereHelper(nameof(RB_Examination_Details_ViewModel.PaperId), PaperId));
             }
+            //删除所有的自己点信息
             if (childList != null && childList.Count > 0)
             {
                 foreach (var item in childList)
@@ -602,9 +603,10 @@ namespace Edu.Module.Exam
         /// 根据试卷编号复制试卷
         /// </summary>
         /// <param name="PaperId"></param>
+        /// <param name="UserInfo">用户信息</param>
         /// <returns></returns>
         [TransactionCallHandler]
-        public bool CopyExamnationPaperModule(int PaperId)
+        public bool CopyExamnationPaperModule(int PaperId, UserInfo UserInfo)
         {
             var flag = true;
             var model = GetExaminationPaperModule(PaperId);
@@ -614,6 +616,10 @@ namespace Edu.Module.Exam
                 return flag;
             }
             model.PaperId = 0;
+            model.CreateBy = UserInfo.Id;
+            model.Group_Id = UserInfo.Group_Id;
+            model.School_Id = UserInfo.School_Id;
+            model.CreateTime = DateTime.Now;
             if (model.GroupList != null && model.GroupList.Count > 0)
             {
                 foreach (var gItem in model.GroupList)

Edu.WebApi/Controllers/Exam/ExamController.cs

@@ -339,7 +339,7 @@ namespace Edu.WebApi.Controllers.Exam
         public ApiResult CopyPaper()
         {
             var PaperId = base.ParmJObj.GetInt("PaperId");
-            var flag = paperModule.CopyExamnationPaperModule(PaperId);
+            var flag = paperModule.CopyExamnationPaperModule(PaperId,base.UserInfo);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }