页面修改

Edu.Module.Course/EducationContractModule.cs

@@ -98,7 +98,7 @@ namespace Edu.Module.Course
         /// <summary>
         /// 学员单据处理类
         /// </summary>
-        private StudentBillModule studentBillModule = new StudentBillModule();
+        private readonly StudentBillModule studentBillModule = new StudentBillModule();
 
         /// <summary>
         /// 获取学员信息

Edu.WebApi/Controllers/Applet/AppletIndexController.cs

@@ -558,56 +558,26 @@ namespace Edu.WebApi.Controllers.Applet
             return ApiResult.Success(data: data);
         }
 
-
         /// <summary>
         /// 学生提交答卷
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public ApiResult GetSetStudentPaperDetails()
+        public ApiResult StuSubmitExamPaper()
         {
-            List<RB_Examination_StudentDetails_ViewModel> stuDetailsList = new List<RB_Examination_StudentDetails_ViewModel>();
-
-            var Id = base.ParmJObj.GetInt("PublishId");
+            var PublishId = base.ParmJObj.GetInt("PublishId");
             var GuestId = base.ParmJObj.GetInt("GuestId", 0);
-            var modelPublish = paperModule.GetExaminationPublishModule(Id);
-            var studentModel = modelPublish.StudentList.Where(x => x.GuestId == GuestId).FirstOrDefault();
-            studentModel.ExamEndTime = System.DateTime.Now;
-            var extModel = new RB_Examination_Paper_ViewModel()
-            {
-                PaperId = base.ParmJObj.GetInt("PaperId"),
-                PaperName = base.ParmJObj.GetStringValue("PaperName"),
-                QuestionBandIds = base.ParmJObj.GetStringValue("QuestionBandIds"),
-                DifficultyType = (DifficultyTypeEnum)base.ParmJObj.GetInt("DifficultyType"),
-                Group_Id = base.ParmJObj.GetInt("Group_Id"),
-                GenerateType = base.ParmJObj.GetInt("GenerateType"),
-                CreateNum = base.ParmJObj.GetInt("CreateNum"),
-                PaperType = base.ParmJObj.GetInt("PaperType"),
-                ParentId = base.ParmJObj.GetInt("ParentId"),
-            };
-            extModel.GroupList = new List<RB_Examination_Group_ViewModel>();
+            var PaperId = base.ParmJObj.GetInt("PaperId");
+            List<RB_Examination_Details_ViewModel> paperDetailsList = new List<RB_Examination_Details_ViewModel>();
             string groups = base.ParmJObj.GetStringValue("GroupList");
             if (!string.IsNullOrEmpty(groups))
             {
                 JArray jarray = JArray.Parse(groups);
                 if (jarray != null && jarray.Count > 0)
                 {
-                    int gSortNum = 0;
                     foreach (var jItem in jarray)
                     {
                         JObject jobj = JObject.Parse(jItem.ToString());
-                        RB_Examination_Group_ViewModel gModel = new RB_Examination_Group_ViewModel()
-                        {
-                            GId = jobj.GetInt("GId"),
-                            PaperId = jobj.GetInt("PaperId"),
-                            GroupName = jobj.GetStringValue("GroupName"),
-                            QuestionTypeId = jobj.GetInt("QuestionTypeId"),
-                            QuestionTypeKey = jobj.GetStringValue("QuestionTypeKey"),
-                            GSortNum = gSortNum,
-                            GScore = jobj.GetDecimal("GScore"),
-                            DetailsList = new List<RB_Examination_Details_ViewModel>(),
-                        };
-                        gSortNum++;
                         string details = jobj.GetStringValue("DetailsList");
                         if (!string.IsNullOrEmpty(details))
                         {
@@ -618,12 +588,12 @@ namespace Edu.WebApi.Controllers.Applet
                                 JObject sObj = JObject.Parse(sItem.ToString());
                                 var detailModel = new RB_Examination_Details_ViewModel()
                                 {
-                                    Id = sObj.GetInt("Id"),
+                                    Id = sObj.GetInt("PaperDetailsId"),
                                     PaperId = sObj.GetInt("PaperId"),
                                     BankId = sObj.GetInt("BankId"),
                                     QuestionId = sObj.GetInt("QuestionId"),
                                     Title = sObj.GetStringValue("Title"),
-                                    QuestionContent = sObj.GetStringValue("QuestionContent"),
+                                    QuestionContent = sObj.GetStringValue("QuestionContentObj"),
                                     DifficultyType = (DifficultyTypeEnum)sObj.GetInt("DifficultyType"),
                                     AnswerParse = sObj.GetStringValue("AnswerParse"),
                                     QuestionTypeId = sObj.GetInt("QuestionTypeId"),
@@ -637,33 +607,15 @@ namespace Edu.WebApi.Controllers.Applet
                                     IsMutex = sObj.GetInt("IsMutex"),
                                     StundetDetailsId = sObj.GetInt("StundetDetailsId"),
                                     LevelType = (LevelTypeEnum)sObj.GetInt("LevelType"),
-                                    StundetScore = sObj.GetDecimal("StundetScore"),
-                                };
-                                dSortNum++;
-
-                                var studentDetailsModel = new RB_Examination_StudentDetails_ViewModel()
-                                {
-
-                                    Id = detailModel.StundetDetailsId,
-                                    PaperId = detailModel.PaperId,
-                                    PublishId = base.ParmJObj.GetInt("PublishId"),
-                                    DetailsId = detailModel.Id,
-                                    GuestId = GuestId,
-                                    CreateTime = System.DateTime.Now,
-                                    Status = Common.Enum.DateStateEnum.Normal,
-                                    StundetAnswer = detailModel.StundetAnswer,
-                                    StundetScore = detailModel.StundetScore,
-                                    IsMarking = 0
+                                    Answer=sObj.GetStringValue("Answer"),
                                 };
-                                stuDetailsList.Add(studentDetailsModel);
-                                gModel.DetailsList.Add(detailModel);
+                                paperDetailsList.Add(detailModel);
                             }
                         }
-                        extModel.GroupList.Add(gModel);
                     }
                 }
             }
-            var result = paperModule.SetStudentPaperDetails(stuDetailsList, studentModel);
+            var result = paperModule.SetStuExamPaperDetailsModule(PublishId, GuestId,PaperId, paperDetailsList);
             return result ? ApiResult.Success("提交试卷成功") : ApiResult.Failed("提交试卷失败");
         }
         #endregion