页面修改

Edu.Module.Exam/PaperModule.cs

@@ -613,24 +613,43 @@ namespace Edu.Module.Exam
                     {nameof(RB_Examination_Paper_ViewModel.Reviewer),obj.ZuJuanReviewer }
                 };
                 flag = examination_PaperRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Paper_ViewModel.PaperId), model.PaperId));
+            }
+            return flag;
+        }
 
-
-                var educationReceipt = new Model.Entity.EduTask.RB_Education_Receipt()
-                {
-                    Id = 0,
-                    Title = "组卷审批",
-                    ReceiptType = Common.Enum.Finance.ReceiptTypeEnum.ZuJuan,
-                    RelationId = model.PaperId,
-                    ClassId = 0,
-                    Group_Id = model.Group_Id,
-                    School_Id = model.School_Id,
-                    CreateBy = model.CreateBy,
-                    CreateTime = model.CreateTime,
-                    UpdateBy = model.CreateBy,
-                    UpdateTime = model.CreateTime,
-                    VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng,
-                    ReceiptFile = ""
-                };
+        /// <summary>
+        /// 提交组卷审批
+        /// </summary>
+        /// <param name="PaperId"></param>
+        /// <returns></returns>
+        public bool SubmitApprovalModule(int PaperId)
+        {
+            bool flag = false;
+            var model = GetExaminationPaperModule(PaperId);
+            var educationReceipt = new Model.Entity.EduTask.RB_Education_Receipt()
+            {
+                Id = 0,
+                Title = "组卷审批",
+                ReceiptType = Common.Enum.Finance.ReceiptTypeEnum.ZuJuan,
+                RelationId = model.PaperId,
+                ClassId = 0,
+                Group_Id = model.Group_Id,
+                School_Id = model.School_Id,
+                CreateBy = model.CreateBy,
+                CreateTime = model.CreateTime,
+                UpdateBy = model.CreateBy,
+                UpdateTime = model.CreateTime,
+                VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng,
+                ReceiptFile = ""
+            };
+            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 },
+            };
+            flag = examination_PaperRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Paper_ViewModel.PaperId), model.PaperId));
+            if (flag)
+            {
                 flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out string message);
             }
             return flag;

Edu.Repository/Contract/RB_BackClass_ProtocolRepository.cs

@@ -31,10 +31,11 @@ WHERE 1=1
             {
                 if (query.BackId > 0)
                 {
-                    if (query.QCreateBy > 0)
-                    {
-                        builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_BackClass_Protocol_ViewModel.BackId), query.BackId);
-                    }
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_BackClass_Protocol_ViewModel.BackId), query.BackId);
+                }
+                if (query.QCreateBy > 0)
+                {
+                    builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_BackClass_Protocol_ViewModel.CreateBy), query.QCreateBy);
                 }
             }
             return Get<RB_BackClass_Protocol_ViewModel>(builder.ToString()).ToList();

Edu.WebApi/Controllers/Exam/ExamController.cs

@@ -188,7 +188,7 @@ namespace Edu.WebApi.Controllers.Exam
                                     Score = sObj.GetDecimal("Score"),
                                 };
                                 dSortNum++;
-                                string msg= analysisQuestion.CheckQuestion(detailModel.QuestionTypeKey, detailModel.QuestionContent, detailModel.Answer, out string newAnswer);
+                                string msg = analysisQuestion.CheckQuestion(detailModel.QuestionTypeKey, detailModel.QuestionContent, detailModel.Answer, out string newAnswer);
                                 if (!string.IsNullOrEmpty(msg))
                                 {
                                     return ApiResult.Failed(message: msg);
@@ -597,6 +597,19 @@ namespace Edu.WebApi.Controllers.Exam
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 提交组卷审批
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+
+        public ApiResult SubmitApproval()
+        {
+            int PaperId = base.ParmJObj.GetInt("PaperId");
+            var flag = paperModule.SubmitApprovalModule(PaperId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
 
         #region 考试配置
         /// <summary>