解决冲突

Edu.Model/Entity/Exam/RB_Examination_Student.cs

@@ -45,6 +45,31 @@ namespace Edu.Model.Entity.Exam
 		/// <summary>
 		/// 课程编号
 		/// </summary>
-		public int? CourseId { get; set; }
+		public int CourseId { get; set; }
+
+		/// <summary>
+		/// 创建时间
+		/// </summary>
+		public DateTime CreateTime { get; set; }
+
+		/// <summary>
+		/// 创建人
+		/// </summary>
+		public int CreateBy { get; set; }
+
+		/// <summary>
+		/// 集团编号
+		/// </summary>
+		public int Group_Id { get; set; }
+
+		/// <summary>
+		/// 校区编号
+		/// </summary>
+		public int School_Id { get; set; }
+
+		/// <summary>
+		/// 状态
+		/// </summary>
+		public int Status { get; set; }
 	}
 }

Edu.Model/ViewModel/Exam/RB_Examination_Publish_ViewModel.cs

@@ -10,6 +10,19 @@ namespace Edu.Model.ViewModel.Exam
     /// </summary>
     public class RB_Examination_Publish_ViewModel : RB_Examination_Publish
     {
+        /// <summary>
+        /// 考试学员列表
+        /// </summary>
+        public List<RB_Examination_Student_ViewModel> StudentList { get; set; }
 
+        /// <summary>
+        /// 试卷名称
+        /// </summary>
+        public string PaperName { get; set; }
+
+        /// <summary>
+        /// 考生人数
+        /// </summary>
+        public int StudentCount { get; set; }
     }
 }

Edu.Model/ViewModel/Exam/RB_Examination_Student_ViewModel.cs

@@ -10,6 +10,14 @@ namespace Edu.Model.ViewModel.Exam
     /// </summary>
     public class RB_Examination_Student_ViewModel : RB_Examination_Student
     {
+        /// <summary>
+        /// 试卷发布编号
+        /// </summary>
+        public string QPublishIds { get; set; }
 
+        /// <summary>
+        /// 学员名称
+        /// </summary>
+        public string GuestName { get; set; }
     }
 }
\ No newline at end of file

Edu.Module.Course/CourseModule.cs

@@ -144,6 +144,7 @@ namespace Edu.Module.Course
         /// 商品规格价格
         /// </summary>
         private readonly Repository.Mall.RB_Goods_SpecificationPriceRepository goods_SpecificationPriceRepository = new Repository.Mall.RB_Goods_SpecificationPriceRepository();
+       
         #region 课程管理
 
         public List<RB_Course_ViewModel> GetAllCourseChapterCountModule(int groupId, int courseId)
@@ -377,6 +378,7 @@ namespace Edu.Module.Course
                 }
             }
             #endregion
+
             return flag;
         }
 

Edu.Module.Exam/PaperModule.cs

@@ -58,6 +58,10 @@ namespace Edu.Module.Exam
         /// </summary>
         private readonly RB_Examination_ConfigureRepository examination_ConfigureRepository = new RB_Examination_ConfigureRepository();
 
+        /// 试卷考试学员仓储层对象
+        /// </summary>
+        private readonly RB_Examination_StudentRepository examination_StudentRepository = new RB_Examination_StudentRepository();
+
         /// <summary>
         /// 获取试卷分页列表
         /// </summary>
@@ -687,7 +691,24 @@ namespace Edu.Module.Exam
         /// <returns></returns>
         public List<RB_Examination_Publish_ViewModel> GetExaminationPublishPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Examination_Publish_ViewModel query)
         {
-            return examination_PublishRepository.GetExaminationPublishPageRepository(pageIndex, pageSize, out rowsCount, query);
+            var list= examination_PublishRepository.GetExaminationPublishPageRepository(pageIndex, pageSize, out rowsCount, query);
+            if (list != null && list.Count > 0)
+            {
+                string ids = string.Join(",", list.Select(qitem => qitem.Id));
+                List<RB_Examination_Student_ViewModel> stuList = new List<RB_Examination_Student_ViewModel>();
+                if (!string.IsNullOrEmpty(ids))
+                {
+                    stuList= examination_StudentRepository.GetExaminationStudentListRepository(new RB_Examination_Student_ViewModel()
+                    {
+                        QPublishIds = ids
+                    });
+                }
+                foreach (var item in list)
+                {
+                    item.StudentCount = stuList?.Where(qitem => qitem.PublishId == item.Id)?.Count()??0;
+                }
+            }
+            return list;
         }
 
         /// <summary>
@@ -731,6 +752,59 @@ namespace Edu.Module.Exam
                 model.Id = newId;
                 flag = newId > 0;
             }
+
+            var oldStudentList = examination_StudentRepository.GetExaminationStudentListRepository(new RB_Examination_Student_ViewModel() { PublishId = model.Id });
+            //以前没有学员【直接新增】
+            if (oldStudentList == null || (oldStudentList != null && oldStudentList.Count == 0))
+            {
+                if (model.StudentList != null && model.StudentList.Count > 0)
+                {
+                    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);
+                    }
+                }
+            }
+            else//以前有学员
+            {
+                //现在没有学员了【直接删除以前的学员】
+                if (model.StudentList == null || (model.StudentList != null && model.StudentList.Count == 0))
+                {
+                    examination_StudentRepository.DeleteOne(new WhereHelper(nameof(RB_Examination_Student_ViewModel.PublishId), model.Id));
+                }
+                //找出差异的数据
+                var deleteList = oldStudentList.Where(qitem => !model.StudentList.Any(oldItem => qitem.Id == oldItem.Id)).ToList();
+                foreach (var dItem in deleteList)
+                {
+                    if (dItem.Id > 0)
+                    {
+                        examination_StudentRepository.DeleteOne(new WhereHelper(nameof(RB_Examination_Student_ViewModel.Id), dItem.Id));
+                    }
+                }
+                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;
+                    dItem.School_Id = model.School_Id;
+                    if (dItem.Id == 0)
+                    {
+                        examination_StudentRepository.Insert(dItem);
+                    }
+                    else
+                    {
+                        examination_StudentRepository.Update(dItem);
+                    }
+                }
+            }
             return flag;
         }
 
@@ -786,5 +860,26 @@ namespace Edu.Module.Exam
             return flag;
         }
         #endregion
+        /// <summary>
+        /// 根据编号获取考试发布详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        public RB_Examination_Publish_ViewModel GetExaminationPublishModule(object Id)
+        {
+            var extModel = examination_PublishRepository.GetEntity<RB_Examination_Publish_ViewModel>(Id);
+            if (extModel == null)
+            {
+                extModel = new RB_Examination_Publish_ViewModel();
+            }
+            if (extModel != null&&extModel.Id>0)
+            {
+                extModel.StudentList = examination_StudentRepository.GetExaminationStudentListRepository(new RB_Examination_Student_ViewModel()
+                {
+                    PublishId = extModel.Id
+                });
+            }
+            return extModel;
+        }
     }
 }

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.Repository/Exam/RB_Examination_StudentRepository.cs

 using Edu.Model.Entity.Exam;
+using Edu.Model.ViewModel.Exam;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace Edu.Repository.Exam
@@ -10,6 +12,65 @@ namespace Edu.Repository.Exam
     /// </summary>
     public class RB_Examination_StudentRepository:BaseRepository<RB_Examination_Student>
     {
+        /// <summary>
+        /// 获取考试学生分页列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="rowsCount"></param>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Examination_Student_ViewModel> GetExaminationStudentPageRepository(int pageIndex, int pageSize, out long rowsCount, RB_Examination_Student_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.GuestName,'') AS GuestName
+FROM RB_Examination_Student AS A LEFT JOIN rb_order_guest AS B ON A.GuestId=B.Id
+WHERE 1=1 
+");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Examination_Student_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (query.PublishId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Examination_Student_ViewModel.PublishId), query.PublishId);
+                }
+            }
+            return GetPage<RB_Examination_Student_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
+        }
 
+        /// <summary>
+        /// 获取考试学生列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Examination_Student_ViewModel> GetExaminationStudentListRepository(RB_Examination_Student_ViewModel query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(@"
+SELECT A.*,IFNULL(B.GuestName,'') AS GuestName
+FROM RB_Examination_Student AS A LEFT JOIN rb_order_guest AS B ON A.GuestId=B.Id
+WHERE 1=1 
+");
+            if (query != null)
+            {
+                if (query.Group_Id > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Examination_Student_ViewModel.Group_Id), query.Group_Id);
+                }
+                if (query.PublishId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Examination_Student_ViewModel.PublishId), query.PublishId);
+                }
+                if (!string.IsNullOrEmpty(query.QPublishIds))
+                {
+                    builder.AppendFormat(" AND A.{0} IN({1}) ", nameof(RB_Examination_Student_ViewModel.PublishId), query.QPublishIds);
+                }
+            }
+            return Get<RB_Examination_Student_ViewModel>(builder.ToString()).ToList();
+        }
     }
 }
\ No newline at end of file

Edu.Repository/Sell/RB_Order_GuestRepository.cs

@@ -4,6 +4,7 @@ using Edu.Model.ViewModel.Sell;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using VT.FW.DB.Dapper;
 
 namespace Edu.Repository.Sell
 {
@@ -65,10 +66,10 @@ namespace Edu.Repository.Sell
         /// 获取列表
         /// </summary>
         /// <param name="demodel"></param>
-        /// <param name="orderIds"></param>
         /// <returns></returns>
         public List<RB_Order_Guest_ViewModel> GetCommonOrderGuestListRepository(RB_Order_Guest_ViewModel demodel)
         {
+            var parameters = new DynamicParameters();
             string where = "";
             if (demodel.Group_Id > 0)
             {
@@ -100,7 +101,18 @@ namespace Edu.Repository.Sell
             }
             if (!string.IsNullOrEmpty(demodel.GuestName))
             {
-                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.GuestName)} like '%{demodel.GuestName}%'";
+                where += $@" and A.{nameof(RB_Order_Guest_ViewModel.GuestName)} LIKE @GuestName ";
+                parameters.Add("GuestName", "%" + demodel.GuestName.Trim() + "%");
+            }
+            if (!string.IsNullOrEmpty(demodel.ClassName))
+            {
+                where += $@" and cs.{nameof(RB_Order_Guest_ViewModel.ClassName)} LIKE @ClassName ";
+                parameters.Add("ClassName", "%" + demodel.ClassName.Trim() + "%");
+            }
+            if (!string.IsNullOrEmpty(demodel.ClassNo))
+            {
+                where += $@" and cs.{nameof(RB_Order_Guest_ViewModel.ClassNo)} LIKE @ClassNo ";
+                parameters.Add("ClassNo", "%" + demodel.ClassNo.Trim() + "%");
             }
             if (demodel.GuestState > 0)
             {
@@ -112,16 +124,17 @@ namespace Edu.Repository.Sell
             }
 
             string sql = $@" 
-SELECT sog.Student_Id as StudentId,A.*,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS TargetJoinType,IFNULL(B.StartClassHours,0) AS StartClassHours
+SELECT sog.Student_Id as StudentId,A.*,cs.ClassName,cs.ClassNo,IFNULL(B.JoinType,0) AS JoinType,IFNULL(B.TargetJoinType,0) AS TargetJoinType,IFNULL(B.StartClassHours,0) AS StartClassHours
        ,IFNULL(C.CourseName,'') AS CourseName,B.EffectStatus,B.EffectTime,B.UpOrderId,B.OrderType,B.CourseId,B.IsRenewOrder,B.RenewOrderId,B.EnterID
        ,sc.StopClassEffectTime,B.SourceOrderId,B.TargetOrderId,IFNULL(D.FirstClassHours,0)+IFNULL(D.SecondClassHours,0)+IFNULL(D.ThirdClassHours,0) AS ContractTotalHours
 FROM RB_Order_Guest AS A LEFT JOIN rb_order AS B ON A.OrderId=B.OrderId
-LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.Id
+     LEFT JOIN rb_class AS cs ON B.ClassId=cs.ClassId
+     LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.Id
      LEFT JOIN rb_course AS C ON (B.CourseId=C.CourseId AND B.CourseId>0 AND B.OrderType=1)
      LEFT JOIN (SELECT OrderGuestId,MAX(TakeEffectTime) as StopClassEffectTime from rb_student_stopclass where IsAuditThrough=1 GROUP BY OrderGuestId) as sc on sc.OrderGuestId=a.Id
      LEFT JOIN rb_education_contract AS D ON A.OrderId=D.OrderId AND A.Id=D.GuestId AND D.IsSystemUse=1
-WHERE 1=1 and A.Status=0 {where}";
-            return Get<RB_Order_Guest_ViewModel>(sql).ToList();
+WHERE 1=1 and A.Status=0  {where}";
+            return Get<RB_Order_Guest_ViewModel>(sql, parameters).ToList();
         }
 
 
@@ -226,8 +239,6 @@ WHERE 1=1 AND A.Status=0
             }
         }
 
-
-
         /// <summary>
         /// 获取列表
         /// </summary>
@@ -359,11 +370,7 @@ WHERE  1=1 and A.Status=0 and class.Status=0   and b.OrderState<>3
         /// <summary>
         /// 获取分页列表
         /// </summary>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <param name="rowsCount"></param>
         /// <param name="demodel"></param>
-        /// <param name="orderIds"></param>
         /// <returns></returns>
         public List<RB_Order_Guest_ViewModel> GetStopingStudentPage(RB_Order_Guest_ViewModel demodel)
         {

Edu.WebApi/Controllers/Course/ClassController.cs

@@ -1272,6 +1272,24 @@ namespace Edu.WebApi.Controllers.Course
             return result ? ApiResult.Success() : ApiResult.Failed("签到失败");
         }
 
+        /// <summary>
+        /// 获取班级学生树形列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetClassStudentTree()
+        {
+            var query = new RB_Order_Guest_ViewModel()
+            {
+                GuestName = base.ParmJObj.GetStringValue("GuestName"),
+                ClassName = base.ParmJObj.GetStringValue("ClassName"),
+                ClassNo = ParmJObj.GetStringValue("ClassNo"),
+            };
+            query.Group_Id = base.UserInfo.Group_Id;
+            var obj = classModule.GetClassStudentTreeModule(query);
+            return ApiResult.Success(data: obj);
+        }
+
         /// <summary>
         /// 签到
         /// </summary>

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;
@@ -403,6 +404,11 @@ namespace Edu.WebApi.Controllers.Exam
                 FillInIsIgnore = base.ParmJObj.GetInt("FillInIsIgnore"),
                 IsHalfScore = base.ParmJObj.GetInt("IsHalfScore"),
             };
+            var studentStr = base.ParmJObj.GetStringValue("StudentList");
+            if (!string.IsNullOrEmpty(studentStr))
+            {
+                model.StudentList = Common.Plugin.JsonHelper.DeserializeObject<List<RB_Examination_Student_ViewModel>>(studentStr);
+            }
             model.CreateBy = base.UserInfo.Id;
             model.CreateTime = DateTime.Now;
             model.Group_Id = base.UserInfo.Group_Id;
@@ -412,6 +418,18 @@ namespace Edu.WebApi.Controllers.Exam
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 根据编号获取考试发布详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetExamPublish()
+        {
+            var Id  = base.ParmJObj.GetInt("Id");
+            var model = paperModule.GetExaminationPublishModule(Id);
+            return ApiResult.Success(data: model);
+        }
+
         /// <summary>
         /// 获取发布考试分页列表
         /// </summary>
@@ -423,13 +441,25 @@ 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,
+                    item.StudentCount,
+                };
+                result.Add(obj);
             }
             pageModel.Count = rowsCount;
             pageModel.PageData = result;