Commit 8752fc1f authored by 吴春's avatar 吴春

提交代码

parent c4828a86
......@@ -19,5 +19,23 @@ namespace Edu.Model.ViewModel.Exam
/// 学员名称
/// </summary>
public string GuestName { get; set; }
/// <summary>
/// 班级名称
/// </summary>
public string ClassName { get; set; }
/// <summary>
/// 联系电话
/// </summary>
public string Mobile { get; set; }
/// <summary>
/// 学员头像
/// </summary>
public string StuIcon { get; set; }
}
}
\ No newline at end of file
......@@ -691,21 +691,21 @@ 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)
{
var list= 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()
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;
item.StudentCount = stuList?.Where(qitem => qitem.PublishId == item.Id)?.Count() ?? 0;
}
}
return list;
......@@ -872,7 +872,7 @@ namespace Edu.Module.Exam
{
extModel = new RB_Examination_Publish_ViewModel();
}
if (extModel != null&&extModel.Id>0)
if (extModel != null && extModel.Id > 0)
{
extModel.StudentList = examination_StudentRepository.GetExaminationStudentListRepository(new RB_Examination_Student_ViewModel()
{
......@@ -881,5 +881,22 @@ namespace Edu.Module.Exam
}
return extModel;
}
#region 学生管理
/// <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)
{
return examination_StudentRepository.GetExaminationStudentPageRepository(pageIndex, pageSize, out rowsCount, query);
}
#endregion
}
}
......@@ -24,8 +24,11 @@ namespace Edu.Repository.Exam
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.*,IFNULL(B.GuestName,'') AS GuestName
SELECT A.*,IFNULL(B.GuestName,'') AS GuestName,c.ClassName,b.Mobile,s.StuIcon
FROM RB_Examination_Student AS A LEFT JOIN rb_order_guest AS B ON A.GuestId=B.Id
LEFT JOIN rb_class as c on c.ClassId=a.ClassId
LEFT JOIN rb_student_orderguest as sog on sog.GuestId=a.GuestId
LEFT JOIN rb_student as s on s.StuId = sog.Student_Id
WHERE 1=1
");
if (query != null)
......@@ -38,6 +41,10 @@ WHERE 1=1
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Examination_Student_ViewModel.PublishId), query.PublishId);
}
if (!string.IsNullOrWhiteSpace(query.GuestName))
{
builder.AppendFormat(" AND B.{0}={1} ", nameof(RB_Examination_Student_ViewModel.GuestName), query.GuestName);
}
}
return GetPage<RB_Examination_Student_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString()).ToList();
}
......
......@@ -529,5 +529,48 @@ namespace Edu.WebApi.Controllers.Exam
return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed();
}
#endregion
#region 学生管理
/// <summary>
/// 获取学生管理分页列表
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetExaminationStudentPage()
{
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Examination_Student_ViewModel()
{
PublishId = base.ParmJObj.GetInt("PublishId"),
GuestName = base.ParmJObj.GetStringValue("GuestName"),
};
query.Group_Id = base.UserInfo.Group_Id;
List<object> result = new List<object>();
var list = paperModule.GetExaminationStudentPageRepository(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list)
{
var obj = new
{
item.Id,
item.PaperId,
item.Mobile,
item.GuestName,
item.GuestId,
item.ClassName,
item.StuIcon,
item.OrderId,
item.ClassId,
item.CourseId,
item.PublishId,
CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "",
};
result.Add(obj);
}
pageModel.Count = rowsCount;
pageModel.PageData = result;
return ApiResult.Success(data: pageModel);
}
#endregion
}
}
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