页面修改

Edu.Model/ViewModel/Exam/ExaminationPaperTreeModel.cs

@@ -31,14 +31,14 @@ namespace Edu.Model.ViewModel.Exam
 		public DifficultyTypeEnum DifficultyType { get; set; }
 
 		/// <summary>
-		/// 创建时间
+		/// 创建人
 		/// </summary>
-		public DateTime CreateTime { get; set; }
+		public string CreateByName { get; set; }
 
 		/// <summary>
-		/// 创建人
+		/// 创建时间
 		/// </summary>
-		public int CreateBy { get; set; }
+		public string CreateTimeStr { get; set; }
 
 		/// <summary>
 		/// 发布次数
@@ -65,6 +65,11 @@ namespace Edu.Model.ViewModel.Exam
 		/// </summary>
 		public int ParentId { get; set; }
 
+		/// <summary>
+		/// 题目数量
+		/// </summary>
+		public int QuestionCount { get; set; }
+
 		/// <summary>
 		/// 下级节点
 		/// </summary>

Edu.Model/ViewModel/Exam/RB_Examination_Paper_ViewModel.cs

@@ -10,15 +10,7 @@ namespace Edu.Model.ViewModel.Exam
     /// </summary>
     public class RB_Examination_Paper_ViewModel : RB_Examination_Paper
     {
-        /// <summary>
-        /// 创建人
-        /// </summary>
-        public string CreateByName { get; set; }
 
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public string CreateTimeStr { get { return Common.ConvertHelper.FormatDate(this.CreateTime); } }
 
         /// <summary>
         /// 试卷题目分组列表

Edu.Module.Exam/PaperModule.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using VT.FW.DB;
 using System.Linq;
 using System.Text.RegularExpressions;
+using Edu.Cache.User;
 
 namespace Edu.Module.Exam
 {
@@ -57,13 +58,14 @@ namespace Edu.Module.Exam
                         PaperName = item.PaperName,
                         QuestionBandIds = item.QuestionBandIds,
                         DifficultyType = item.DifficultyType,
-                        CreateTime = item.CreateTime,
-                        CreateBy = item.CreateBy,
+                        CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
+                        CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName??"",
                         PublishCount = item.PublishCount,
                         GenerateType = item.GenerateType,
                         CreateNum = item.CreateNum,
                         PaperType = item.PaperType,
                         ParentId = item.ParentId,
+                        QuestionCount=0,
                         ChildList = new List<ExaminationPaperTreeModel>(),
                     };
                     model.ChildList = GetPaperChild(childList, item.PaperId);
@@ -95,13 +97,14 @@ namespace Edu.Module.Exam
                         PaperName = childItem.PaperName,
                         QuestionBandIds = childItem.QuestionBandIds,
                         DifficultyType = childItem.DifficultyType,
-                        CreateTime = childItem.CreateTime,
-                        CreateBy = childItem.CreateBy,
+                        CreateTimeStr = Common.ConvertHelper.FormatTime(childItem.CreateTime),
+                        CreateByName = UserReidsCache.GetUserLoginInfo(childItem.CreateBy)?.AccountName ?? "",
                         PublishCount = childItem.PublishCount,
                         GenerateType = childItem.GenerateType,
                         CreateNum = childItem.CreateNum,
                         PaperType = childItem.PaperType,
                         ParentId = childItem.ParentId,
+                        QuestionCount = 0,
                         ChildList = new List<ExaminationPaperTreeModel>(),
                     };
                     childModel.ChildList.AddRange(GetPaperChild(sourceList, childItem.PaperId));
@@ -111,8 +114,6 @@ namespace Edu.Module.Exam
             return resultList;
         }
 
-
-
         /// <summary>
         /// 获取试卷题目列表
         /// </summary>

Edu.WebApi/Controllers/Exam/ExamController.cs

@@ -51,11 +51,10 @@ namespace Edu.WebApi.Controllers.Exam
                 {
                     item.PaperId,
                     item.PaperName,
-                    CreateByName= UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "",
-                    CreateTimeStr=Common.ConvertHelper.FormatTimeStr(item.CreateTime),
-                    DifficultyTypeName = item.DifficultyType.ToName(),
+                    item.CreateTimeStr,
+                    item.CreateByName,
                     item.PublishCount,
-                    QuestionCount=0,
+                    item.QuestionCount,
                     item.ParentId,
                     item.PaperType,
                     item.ChildList,