Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

Edu.Model/ViewModel/Exam/ExaminationPaperTreeModel.cs

@@ -80,6 +80,11 @@ namespace Edu.Model.ViewModel.Exam
 		/// </summary>
 		public Common.Enum.EduTask.EduTaskRrocessStatus ExamineStatus { get; set; }
 
+
+		/// <summary>
+		/// 审核状态
+		/// </summary>
+		public string ExamineStatusStr { get; set; }
 		/// <summary>
 		/// 审核人
 		/// </summary>
@@ -89,5 +94,7 @@ namespace Edu.Model.ViewModel.Exam
 		/// 审核人
 		/// </summary>
 		public string ReviewerName { get; set; }
+
+		
 	}
 }

Edu.Module.Exam/PaperModule.cs

@@ -230,6 +230,7 @@ namespace Edu.Module.Exam
                         ChildList = new List<ExaminationPaperTreeModel>(),
                         ExamineStatus = childItem.ExamineStatus,
                         Reviewer = childItem.Reviewer,
+                        ExamineStatusStr = childItem.PaperType == 2 ? EnumHelper.ToName(childItem.ExamineStatus) : "",
                         ReviewerName = childItem.Reviewer > 0 ? (UserReidsCache.GetUserLoginInfo(childItem.Reviewer)?.AccountName ?? "") : ""
                     };
                     childModel.ChildList.AddRange(GetPaperChild(sourceList, detailsList, childItem.PaperId));
@@ -407,6 +408,15 @@ namespace Edu.Module.Exam
             var newPaperId = examination_PaperRepository.Insert(paperModel);
             paperModel.PaperId = newPaperId;
             flag = newPaperId > 0;
+
+
+            var configureModel = new RB_Examination_Configure_ViewModel()
+            {
+                Group_Id = model.Group_Id,
+            };
+            var obj = GetExaminationConfigureModel(configureModel);
+           
+
             if (paperModel.CreateNum > 0)
             {
                 for (var i = 0; i < paperModel.CreateNum; i++)
@@ -427,9 +437,47 @@ namespace Edu.Module.Exam
                         PaperType = 2,
                         ParentId = newPaperId,
                     };
+                    if (obj.IsOpenZuJuan == 0)
+                    {
+                        subModel.Reviewer = 0;
+                        subModel.ExamineStatus = Edu.Common.Enum.EduTask.EduTaskRrocessStatus.AuditThrough;
+                    }
+                    else
+                    {
+                        subModel.Reviewer = obj.ZuJuanReviewer;
+                        subModel.ExamineStatus = Edu.Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng;
+                    }
                     var newSubPaperId = examination_PaperRepository.Insert(subModel);
                     subModel.PaperId = newSubPaperId;
                     flag = newSubPaperId > 0;
+                    if (flag && obj.IsOpenZuJuan == 1 )
+                    {
+                        Dictionary<string, object> fileds = new Dictionary<string, object>()
+                        {
+                            {nameof(RB_Examination_Paper_ViewModel.ExamineStatus),Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng },
+                            {nameof(RB_Examination_Paper_ViewModel.Reviewer),obj.ZuJuanReviewer }
+                        };
+                        flag = examination_PaperRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Paper_ViewModel.PaperId), subModel.PaperId));
+
+                        var educationReceipt = new Model.Entity.EduTask.RB_Education_Receipt()
+                        {
+                            Id = 0,
+                            Title = "组卷审批",
+                            ReceiptType = Common.Enum.Finance.ReceiptTypeEnum.ZuJuan,
+                            RelationId = subModel.PaperId,
+                            ClassId = 0,
+                            Group_Id = subModel.Group_Id,
+                            School_Id = subModel.School_Id,
+                            CreateBy = subModel.CreateBy,
+                            CreateTime = subModel.CreateTime,
+                            UpdateBy = subModel.CreateBy,
+                            UpdateTime = subModel.CreateTime,
+                            VerifyStatus = Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng,
+                            ReceiptFile = ""
+                        };
+                        flag = education_ReceiptRepository.SetEducationReceiptRepository(educationReceipt, out string message);
+                    }
+
                     if (model.TempDataList != null && model.TempDataList.Count > 0)
                     {
                         int G_Sort = 1;