页面修改

Edu.Model/ViewModel/Exam/RB_Examination_Publish_ViewModel.cs

@@ -14,5 +14,10 @@ namespace Edu.Model.ViewModel.Exam
         /// 考试学员列表
         /// </summary>
         public List<RB_Examination_Student_ViewModel> StudentList { get; set; }
+
+        /// <summary>
+        /// 试卷名称
+        /// </summary>
+        public string PaperName { get; set; }
     }
 }

Edu.Module.Exam/PaperModule.cs

@@ -740,8 +740,12 @@ namespace Edu.Module.Exam
                 {
                     foreach (var item in model.StudentList)
                     {
+                        item.CreateBy = model.CreateBy;
+                        item.CreateTime = DateTime.Now;
                         item.PublishId = model.Id;
                         item.PaperId = model.PaperId;
+                        item.Group_Id = model.Group_Id;
+                        item.School_Id = model.School_Id;
                         examination_StudentRepository.Insert(item);
                     }
                 }
@@ -764,6 +768,8 @@ namespace Edu.Module.Exam
                 }
                 foreach (var dItem in model.StudentList)
                 {
+                    dItem.CreateBy = model.CreateBy;
+                    dItem.CreateTime = DateTime.Now;
                     dItem.PublishId = model.Id;
                     dItem.PaperId = model.PaperId;
                     dItem.Group_Id = model.Group_Id;

Edu.Repository/Exam/RB_Examination_PublishRepository.cs

@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using VT.FW.DB.Dapper;
 
 namespace Edu.Repository.Exam
 {
@@ -22,10 +23,11 @@ namespace Edu.Repository.Exam
         /// <returns></returns>
         public List<RB_Examination_Publish_ViewModel> GetExaminationPublishPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Examination_Publish_ViewModel query)
         {
+            var parameters = new DynamicParameters();
             StringBuilder builder = new StringBuilder();
             builder.AppendFormat(@"
-SELECT A.*
-FROM RB_Examination_Publish AS A
+SELECT A.*,IFNULL(B.PaperName,'') AS PaperName
+FROM RB_Examination_Publish AS A LEFT JOIN rb_examination_paper AS B ON A.PaperId=B.PaperId
 WHERE 1=1 
 ");
             if (query != null)
@@ -34,6 +36,11 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Examination_Publish_ViewModel.Group_Id), query.Group_Id);
                 }
+                if (!string.IsNullOrEmpty(query.PaperName))
+                {
+                    builder.AppendFormat(" AND B.{0} LIKE @PaperName ", nameof(RB_Examination_Publish_ViewModel.PaperName));
+                    parameters.Add("PaperName", "%" + query.PaperName.Trim() + "%");
+                }
             }
             return GetPage<RB_Examination_Publish_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
         }

Edu.WebApi/Controllers/Exam/ExamController.cs

-using Edu.Common.API;
+using Edu.Cache.User;
+using Edu.Common.API;
 using Edu.Common.Enum.Course;
 using Edu.Common.Enum.Question;
 using Edu.Common.Plugin;
@@ -366,7 +367,7 @@ namespace Edu.WebApi.Controllers.Exam
                 CreateBy = UserInfo.Id,
                 Group_Id = base.UserInfo.Group_Id,
                 ParentId = base.ParmJObj.GetInt("ParentId"),
-                IsQueryFolder=1,
+                IsQueryFolder = 1,
             };
             var obj = paperModule.GetFolderTreeModule(extModel);
             return ApiResult.Success(data: obj);
@@ -428,13 +429,24 @@ namespace Edu.WebApi.Controllers.Exam
             var query = new RB_Examination_Publish_ViewModel()
             {
                 PaperId = base.ParmJObj.GetInt("PaperId"),
+                PaperName = base.ParmJObj.GetStringValue("PaperName"),
             };
             query.Group_Id = base.UserInfo.Group_Id;
             List<object> result = new List<object>();
             var list = paperModule.GetExaminationPublishPageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
             foreach (var item in list)
             {
-                result.Add(item);
+                var obj = new
+                {
+                    item.Id,
+                    item.PaperId,
+                    item.PaperName,
+                    CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "",
+                    StartTime = Common.ConvertHelper.FormatTime(item.ExamStartTime),
+                    EndTime = Common.ConvertHelper.FormatTime(item.ExamEndTime),
+                    item.ExamTimes,
+                };
+                result.Add(obj);
             }
             pageModel.Count = rowsCount;
             pageModel.PageData = result;