Skip to content

E
Education
Commit 76dacb05 authored by 黄奎's avatar 黄奎
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents 5761989d b1cf3f50
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 15 deletions
Edu.Model/Entity/Course/RB_Class_Check.cs
View file @ 76dacb05
......@@ -21,6 +21,12 @@ namespace Edu.Model.Entity.Course
/// </summary>
public int ClassId { get; set; }
/// <summary>
/// 上课计划时间id
/// </summary>
public int ClassTimeId { get; set; }
/// <summary>
/// 上课日期
/// </summary>
......
Edu.Module.Course/ClassModule.cs
View file @ 76dacb05
......@@ -203,7 +203,7 @@ namespace Edu.Module.Course
{
classTimeList = class_TimeRepository.GetClassTimeListRepository(ids);
classOrderList = orderRepository.GetClassOrderPeopleNum(ids);
otherCourseList= GetClassCourseListModule(new RB_Class_Course_Extend() { QClassIds = ids });
otherCourseList = GetClassCourseListModule(new RB_Class_Course_Extend() { QClassIds = ids });
}
if (isGetStepPrice)
{
......@@ -1040,7 +1040,7 @@ namespace Edu.Module.Course
/// </summary>
/// <param name="classId">班级编号</param>
/// <returns></returns>
public object GetClassStudentListModule(int classId, int school_Id, int group_Id, string ClassDate)
public object GetClassStudentListModule(int classId, int school_Id, int group_Id, int ClassTimeId)
{
List<object> list = new List<object>();
var orderStudentList = order_GuestRepository.GetList(new RB_Order_Guest_ViewModel()
......@@ -1052,18 +1052,18 @@ namespace Edu.Module.Course
var classModel = GetClassModule(classId);
var courseModel = courseRepository.GetEntity((classModel?.CouseId ?? 0));
List<RB_Class_Check_ViewModel> checkList = new List<RB_Class_Check_ViewModel>();
if (!string.IsNullOrWhiteSpace(ClassDate))
if (ClassTimeId > 0)
{
checkList = GetClassCheckList(new RB_Class_Check_ViewModel { Group_Id = group_Id, ClassId = classId, StartDate = ClassDate, EndDate = ClassDate });
checkList = GetClassCheckList(new RB_Class_Check_ViewModel { Group_Id = group_Id, ClassId = classId, ClassTimeId = ClassTimeId });
}
if (orderStudentList != null && orderStudentList.Count > 0)
{
foreach (var item in orderStudentList)
{
int checkStatus = -1;
if (!string.IsNullOrWhiteSpace(ClassDate) && checkList != null && checkList.Any())
if (ClassTimeId > 0 && checkList != null && checkList.Any())
{
checkStatus = checkList?.Where(qitem => qitem.ClassDate.ToString("yyyy-MM-dd") == Convert.ToDateTime(ClassDate).ToString("yyyy-MM-dd") && qitem.ClassId == item.ClassId && qitem.OrderGuestId == item.Id)?.FirstOrDefault()?.CheckStatus ?? -1;
checkStatus = checkList?.Where(qitem => qitem.ClassCheckId == ClassTimeId && qitem.ClassId == item.ClassId && qitem.OrderGuestId == item.Id)?.FirstOrDefault()?.CheckStatus ?? -1;
}
list.Add(new
{
......
Edu.Repository/Course/RB_Class_CheckRepository.cs
View file @ 76dacb05
......@@ -347,6 +347,10 @@ GROUP BY A.ClassId
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Check_ViewModel.ClassId), query.ClassId);
}
if (query.ClassCheckId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Check_ViewModel.ClassCheckId), query.ClassCheckId);
}
if (query.OrderGuestId > 0)
{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Check_ViewModel.OrderGuestId), query.OrderGuestId);
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 76dacb05
......@@ -603,7 +603,7 @@ namespace Edu.WebApi.Controllers.Course
QMonth = base.ParmJObj.GetStringValue("QMonth"),
TeacherId = base.ParmJObj.GetInt("TeacherId"),
Group_Id = base.UserInfo.Group_Id,
School_Id = base.ParmJObj.GetInt("School_Id",-1),
School_Id = base.ParmJObj.GetInt("School_Id", -1),
};
var data = classModule.GetClassPlan_V2(query);
return ApiResult.Success(data: data);
......@@ -709,7 +709,7 @@ namespace Edu.WebApi.Controllers.Course
var classId = base.ParmJObj.GetInt("ClassId");
var schoolId = 0;
//var schoolId = base.ParmJObj.GetInt("School_Id");
var data = classModule.GetClassStudentListModule(classId, schoolId, base.UserInfo.Group_Id, "");
var data = classModule.GetClassStudentListModule(classId, schoolId, base.UserInfo.Group_Id, 0);
return ApiResult.Success(data: data);
}
......@@ -930,7 +930,7 @@ namespace Edu.WebApi.Controllers.Course
foreach (var item in list)
{
var signModel = checkLogList?.Where(qitem => qitem.ClassDate == item.ClassDate && qitem.ClassId == item.ClassId && qitem.OrderGuestId == item.OrderGuestId)?.FirstOrDefault();
var signModel = checkLogList?.Where(qitem => qitem.ClassDate.ToString("yyyy-MM-dd") == item.ClassDate.ToString("yyyy-MM-dd") && qitem.ClassId == item.ClassId && qitem.OrderGuestId == item.OrderGuestId)?.FirstOrDefault();
if (signModel != null && signModel.ClassCheckId > 0)
{
item.ClassCheckId = signModel.ClassCheckId;
......@@ -974,13 +974,19 @@ namespace Edu.WebApi.Controllers.Course
StudyNum = base.ParmJObj.GetInt("StudyNum"),
TeacherId = base.ParmJObj.GetInt("TeacherId"),
ClassId = base.ParmJObj.GetInt("classId"),
ClassCheckId = base.ParmJObj.GetInt("ClassCheckId", 0),
};
exModel.ClassDate = Convert.ToDateTime(exModel.ClassDate.ToString("yyyy-MM-dd 00:00:00"));
if (exModel.ClassCheckId == 0)
{
return ApiResult.Failed("请上课时间ID不能等于0");
}
list.Add(exModel);
if (list == null || !list.Any())
{
return ApiResult.ParamIsNull("");
}
//获取班级的学员信息
var orderGuestList = classModule.GetOrderGuest(new RB_Order_Guest_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = exModel.ClassId });
......@@ -999,11 +1005,11 @@ namespace Edu.WebApi.Controllers.Course
}
//判断当天是否有已签到数据
var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId, StartDate = exModel.ClassDate.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = exModel.ClassDate.ToString("yyyy-MM-dd HH:mm:ss") });
var checkLogList = classModule.GetClassCheckList(new RB_Class_Check_ViewModel { Group_Id = base.UserInfo.Group_Id, ClassId = list.FirstOrDefault().ClassId, ClassCheckId = exModel.ClassCheckId, StartDate = exModel.ClassDate.ToString("yyyy-MM-dd HH:mm:ss"), EndDate = exModel.ClassDate.ToString("yyyy-MM-dd HH:mm:ss") });
foreach (var item in list)
{
var signModel = checkLogList?.Where(qitem => qitem.ClassDate == item.ClassDate && qitem.ClassId == item.ClassId && qitem.OrderGuestId == item.OrderGuestId)?.FirstOrDefault();
var signModel = checkLogList?.Where(qitem => qitem.ClassCheckId == item.ClassCheckId && qitem.ClassId == item.ClassId && qitem.OrderGuestId == item.OrderGuestId)?.FirstOrDefault();
if (signModel != null && signModel.ClassCheckId > 0)
{
item.ClassCheckId = signModel.ClassCheckId;
......@@ -1812,7 +1818,7 @@ namespace Edu.WebApi.Controllers.Course
var classId = base.ParmJObj.GetInt("ClassId");
var schoolId = 0;
var Group_Id = base.ParmJObj.GetInt("Group_Id", 100000);
var data = classModule.GetClassStudentListModule(classId, schoolId, Group_Id, "");
var data = classModule.GetClassStudentListModule(classId, schoolId, Group_Id, 0);
return ApiResult.Success(data: data);
}
......@@ -1825,10 +1831,14 @@ namespace Edu.WebApi.Controllers.Course
public ApiResult GetStudentCheckByClassId()
{
var classId = base.ParmJObj.GetInt("ClassId");
var ClassDate = base.ParmJObj.GetStringValue("ClassDate");
var ClassTimeId = base.ParmJObj.GetInt("ClassTimeId", 0);
var schoolId = 0;
if (classId == 0 || ClassTimeId == 0)
{
return ApiResult.ParamIsNull();
}
var Group_Id = base.ParmJObj.GetInt("Group_Id", 100000);
var data = classModule.GetClassStudentListModule(classId, schoolId, Group_Id, ClassDate);
var data = classModule.GetClassStudentListModule(classId, schoolId, Group_Id, ClassTimeId);
return ApiResult.Success(data: data);
}
#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