Commit d0fb315d authored by 黄奎's avatar 黄奎

页面修改

parent a7752df6
...@@ -45,6 +45,31 @@ namespace Edu.Model.Entity.Exam ...@@ -45,6 +45,31 @@ namespace Edu.Model.Entity.Exam
/// <summary> /// <summary>
/// 课程编号 /// 课程编号
/// </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; }
} }
} }
...@@ -10,6 +10,9 @@ namespace Edu.Model.ViewModel.Exam ...@@ -10,6 +10,9 @@ namespace Edu.Model.ViewModel.Exam
/// </summary> /// </summary>
public class RB_Examination_Publish_ViewModel : RB_Examination_Publish public class RB_Examination_Publish_ViewModel : RB_Examination_Publish
{ {
/// <summary>
/// 考试学员列表
/// </summary>
public List<RB_Examination_Student_ViewModel> StudentList { get; set; }
} }
} }
...@@ -144,6 +144,7 @@ namespace Edu.Module.Course ...@@ -144,6 +144,7 @@ namespace Edu.Module.Course
/// 商品规格价格 /// 商品规格价格
/// </summary> /// </summary>
private readonly Repository.Mall.RB_Goods_SpecificationPriceRepository goods_SpecificationPriceRepository = new Repository.Mall.RB_Goods_SpecificationPriceRepository(); private readonly Repository.Mall.RB_Goods_SpecificationPriceRepository goods_SpecificationPriceRepository = new Repository.Mall.RB_Goods_SpecificationPriceRepository();
#region 课程管理 #region 课程管理
public List<RB_Course_ViewModel> GetAllCourseChapterCountModule(int groupId, int courseId) public List<RB_Course_ViewModel> GetAllCourseChapterCountModule(int groupId, int courseId)
...@@ -377,6 +378,7 @@ namespace Edu.Module.Course ...@@ -377,6 +378,7 @@ namespace Edu.Module.Course
} }
} }
#endregion #endregion
return flag; return flag;
} }
......
...@@ -53,6 +53,11 @@ namespace Edu.Module.Exam ...@@ -53,6 +53,11 @@ namespace Edu.Module.Exam
/// </summary> /// </summary>
private readonly RB_Examination_PublishRepository examination_PublishRepository = new RB_Examination_PublishRepository(); private readonly RB_Examination_PublishRepository examination_PublishRepository = new RB_Examination_PublishRepository();
/// <summary>
/// 试卷考试学员仓储层对象
/// </summary>
private readonly RB_Examination_StudentRepository examination_StudentRepository = new RB_Examination_StudentRepository();
/// <summary> /// <summary>
/// 获取试卷分页列表 /// 获取试卷分页列表
/// </summary> /// </summary>
...@@ -726,6 +731,53 @@ namespace Edu.Module.Exam ...@@ -726,6 +731,53 @@ namespace Edu.Module.Exam
model.Id = newId; model.Id = newId;
flag = newId > 0; 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.PublishId = model.Id;
item.PaperId = model.PaperId;
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.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; return flag;
} }
} }
......
using Edu.Model.Entity.Exam; using Edu.Model.Entity.Exam;
using Edu.Model.ViewModel.Exam;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text; using System.Text;
namespace Edu.Repository.Exam namespace Edu.Repository.Exam
...@@ -10,6 +12,61 @@ namespace Edu.Repository.Exam ...@@ -10,6 +12,61 @@ namespace Edu.Repository.Exam
/// </summary> /// </summary>
public class RB_Examination_StudentRepository:BaseRepository<RB_Examination_Student> 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.*
FROM RB_Examination_Student AS A
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.*
FROM RB_Examination_Student AS A
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 Get<RB_Examination_Student_ViewModel>(builder.ToString()).ToList();
}
} }
} }
\ No newline at end of file
...@@ -403,6 +403,11 @@ namespace Edu.WebApi.Controllers.Exam ...@@ -403,6 +403,11 @@ namespace Edu.WebApi.Controllers.Exam
FillInIsIgnore = base.ParmJObj.GetInt("FillInIsIgnore"), FillInIsIgnore = base.ParmJObj.GetInt("FillInIsIgnore"),
IsHalfScore = base.ParmJObj.GetInt("IsHalfScore"), 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.CreateBy = base.UserInfo.Id;
model.CreateTime = DateTime.Now; model.CreateTime = DateTime.Now;
model.Group_Id = base.UserInfo.Group_Id; model.Group_Id = base.UserInfo.Group_Id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment