页面修改

Edu.Module.Exam/PaperModule.cs

@@ -576,22 +576,29 @@ namespace Edu.Module.Exam
             {
                 Group_Id = model.Group_Id,
             };
+            var examConfig = GetExaminationConfigureModel(configureModel);
             Dictionary<string, object> fileds = new Dictionary<string, object>()
             {
                 {nameof(RB_Examination_Paper_ViewModel.ExamineRemark),"" },
-                {nameof(RB_Examination_Paper_ViewModel.ExamineStatus),Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng },
             };
-            if (configureModel.IsOpenZuJuan == 0)
+            if (examConfig != null && examConfig.Id > 0)
             {
-                fileds.Add(nameof(RB_Examination_Paper_ViewModel.Reviewer), 0);
-                fileds.Add(nameof(RB_Examination_Paper_ViewModel.ExamineStatus), Edu.Common.Enum.EduTask.EduTaskRrocessStatus.AuditThrough);
+                if (examConfig.IsOpenZuJuan == 0)
+                {
+                    fileds.Add(nameof(RB_Examination_Paper_ViewModel.Reviewer), 0);
+                    fileds.Add(nameof(RB_Examination_Paper_ViewModel.ExamineStatus), Edu.Common.Enum.EduTask.EduTaskRrocessStatus.AuditThrough);
+                }
+                else
+                {
+                    fileds.Add(nameof(RB_Examination_Paper_ViewModel.Reviewer), examConfig.ZuJuanReviewer);
+                    fileds.Add(nameof(RB_Examination_Paper_ViewModel.ExamineStatus), Edu.Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng);
+                }
             }
             else
             {
-                fileds.Add(nameof(RB_Examination_Paper_ViewModel.Reviewer), configureModel.ZuJuanReviewer);
-                fileds.Add(nameof(RB_Examination_Paper_ViewModel.ExamineStatus), Edu.Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng);
+                fileds.Add(nameof(RB_Examination_Paper_ViewModel.Reviewer), 0);
+                fileds.Add(nameof(RB_Examination_Paper_ViewModel.ExamineStatus), Edu.Common.Enum.EduTask.EduTaskRrocessStatus.AuditThrough);
             }
-            var obj = GetExaminationConfigureModel(configureModel);
             var educationReceipt = new Model.Entity.EduTask.RB_Education_Receipt()
             {
                 Id = 0,

Edu.WebApi/Controllers/Exam/ExamController.cs

@@ -94,7 +94,8 @@ namespace Edu.WebApi.Controllers.Exam
                     item.Reviewer,
                     item.IsOpen,
                     OpenStr = item.IsOpen == 1 ? "私有" : "公开",
-                    ExamineStatusStr = item.PaperType == 2 ? EnumHelper.ToName(item.ExamineStatus) : "",
+                    item.ExamineStatus,
+                    ExamineStatusStr = item.PaperType == 2 ? (item.ExamineStatus == Common.Enum.EduTask.EduTaskRrocessStatus.NotAudit ? "草稿" : EnumHelper.ToName(item.ExamineStatus)) : "",
                     item.ExamineRemark,
                 });
             }
@@ -572,7 +573,6 @@ namespace Edu.WebApi.Controllers.Exam
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-
         public ApiResult SubmitApproval()
         {
             int PaperId = base.ParmJObj.GetInt("PaperId");