提交代码

Edu.Model/ViewModel/Exam/ExaminationPaperTreeModel.cs

@@ -74,5 +74,20 @@ namespace Edu.Model.ViewModel.Exam
 		/// 下级节点
 		/// </summary>
 		public List<ExaminationPaperTreeModel> ChildList { get; set; }
+
+		/// <summary>
+		/// 审核状态
+		/// </summary>
+		public Common.Enum.EduTask.EduTaskRrocessStatus ExamineStatus { get; set; }
+
+		/// <summary>
+		/// 审核人
+		/// </summary>
+		public int Reviewer { get; set; }
+
+		/// <summary>
+		/// 审核人
+		/// </summary>
+		public string ReviewerName { get; set; }
 	}
 }

Edu.Module.Exam/PaperModule.cs

@@ -133,6 +133,9 @@ namespace Edu.Module.Exam
                         ParentId = item.ParentId,
                         QuestionCount = detailsList?.Where(qitem => qitem.PaperId == item.PaperId)?.FirstOrDefault()?.QuestionCount ?? 0,
                         ChildList = new List<ExaminationPaperTreeModel>(),
+                        ExamineStatus = item.ExamineStatus,
+                        Reviewer = item.Reviewer,
+                        ReviewerName = item.Reviewer > 0 ? (UserReidsCache.GetUserLoginInfo(item.Reviewer)?.AccountName ?? "") : ""
                     };
                     model.ChildList = GetPaperChild(childList, detailsList, item.PaperId);
                     treeList.Add(model);
@@ -172,6 +175,9 @@ namespace Edu.Module.Exam
                         ParentId = childItem.ParentId,
                         QuestionCount = detailsList?.Where(qitem => qitem.PaperId == childItem.PaperId)?.FirstOrDefault()?.QuestionCount ?? 0,
                         ChildList = new List<ExaminationPaperTreeModel>(),
+                        ExamineStatus = childItem.ExamineStatus,
+                        Reviewer = childItem.Reviewer,
+                        ReviewerName = childItem.Reviewer > 0 ? (UserReidsCache.GetUserLoginInfo(childItem.Reviewer)?.AccountName ?? "") : ""
                     };
                     childModel.ChildList.AddRange(GetPaperChild(sourceList, detailsList, childItem.PaperId));
                     resultList.Add(childModel);
@@ -605,7 +611,7 @@ namespace Edu.Module.Exam
         /// <param name="QuestionTypeId">问题类型编号</param>
         /// <returns></returns>
         [TransactionCallHandler]
-        public bool RemoveExamnationGroupModule(int GId, int QuestionTypeId,int PaperId)
+        public bool RemoveExamnationGroupModule(int GId, int QuestionTypeId, int PaperId)
         {
             var flag = true;
             if (GId > 0)

Edu.WebApi/Controllers/Exam/ExamController.cs

@@ -69,7 +69,9 @@ namespace Edu.WebApi.Controllers.Exam
                     item.PaperType,
                     item.DifficultyTypeName,
                     item.ChildList,
-                   
+                    item.ReviewerName,
+                    item.Reviewer,
+                    ExamineStatusStr=EnumHelper.ToName(item.ExamineStatus)
                 });
             }
             pageModel.Count = rowsCount;
@@ -97,7 +99,7 @@ namespace Edu.WebApi.Controllers.Exam
                 CreateNum = base.ParmJObj.GetInt("CreateNum"),
                 PaperType = base.ParmJObj.GetInt("PaperType"),
                 ParentId = base.ParmJObj.GetInt("ParentId"),
-                IsExamine= base.ParmJObj.GetInt("IsExamine"),
+                IsExamine = base.ParmJObj.GetInt("IsExamine"),
             };
             extModel.GroupList = new List<RB_Examination_Group_ViewModel>();
             string groups = base.ParmJObj.GetStringValue("GroupList");
@@ -317,7 +319,7 @@ namespace Edu.WebApi.Controllers.Exam
                 extModel.Reviewer = obj.ZuJuanReviewer;
                 extModel.ExamineStatus = Common.Enum.EduTask.EduTaskRrocessStatus.AuditIng;
             }
-            bool flag = paperModule.SetExaminationPaperFolderModule(extModel,obj);
+            bool flag = paperModule.SetExaminationPaperFolderModule(extModel, obj);
             return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed();
         }
 
@@ -381,7 +383,7 @@ namespace Edu.WebApi.Controllers.Exam
         public ApiResult CopyPaper()
         {
             var PaperId = base.ParmJObj.GetInt("PaperId");
-            var flag = paperModule.CopyExamnationPaperModule(PaperId,base.UserInfo);
+            var flag = paperModule.CopyExamnationPaperModule(PaperId, base.UserInfo);
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }