Skip to content

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

页面修改

parent 3e12e62f
Show whitespace changes
Inline Side-by-side
Showing with 192 additions and 56 deletions
Edu.Module.Course/ClassModule.cs
View file @ ac1d12a6
...@@ -4756,12 +4756,14 @@ namespace Edu.Module.Course ...@@ -4756,12 +4756,14 @@ namespace Edu.Module.Course
x.Date, x.Date,
x.TeacherId, x.TeacherId,
x.TeacherName, x.TeacherName,
x.RoomId, x.RoomName, x.RoomId,
x.RoomName,
x.CourseId, x.CourseId,
x.CourseName, x.CourseName,
x.ShiftSort, x.ShiftSort,
x.CourseSTime, x.CourseSTime,
x.ChapterNo, x.ChapterNo,
x.State,
//x.CourseGradeNo, //x.CourseGradeNo,
}) })
.OrderBy(x => x.Key.CourseSTime).ToList(); .OrderBy(x => x.Key.CourseSTime).ToList();
...@@ -4817,6 +4819,8 @@ namespace Edu.Module.Course ...@@ -4817,6 +4819,8 @@ namespace Edu.Module.Course
AppointState = item.Where(x => x.State == CourseAppointStateEnum.WaitSure).Any() ? 1 : 2, AppointState = item.Where(x => x.State == CourseAppointStateEnum.WaitSure).Any() ? 1 : 2,
item.Key.ShiftSort, item.Key.ShiftSort,
EnrollNum = item.Count(), EnrollNum = item.Count(),
item.Key.State,
StateName=item.Key.State.ToName(),
subAppointList.FirstOrDefault().ScrollMinNum, subAppointList.FirstOrDefault().ScrollMinNum,
subAppointList.FirstOrDefault().ScrollMaxNum subAppointList.FirstOrDefault().ScrollMaxNum
}); });
......
Edu.Module.Course/ScrollClassModule.cs
View file @ ac1d12a6
...@@ -1794,13 +1794,32 @@ namespace Edu.Module.Course ...@@ -1794,13 +1794,32 @@ namespace Edu.Module.Course
bool flag = false; bool flag = false;
//查询当日 所有的预约记录 //查询当日 所有的预约记录
var list = scroll_AppointmentRepository.GetAppointList(new RB_Scroll_Appointment_ViewModel() { Group_Id = userInfo.Group_Id, StartTime = date, EntTime = date, TeacherId = teacherId, ShiftSort = shiftSort }); var list = scroll_AppointmentRepository.GetAppointList(new RB_Scroll_Appointment_ViewModel() { Group_Id = userInfo.Group_Id, StartTime = date, EntTime = date, TeacherId = teacherId, ShiftSort = shiftSort });
if (list.Where(x => x.State != Common.Enum.Course.CourseAppointStateEnum.WaitSure).Any()) { return "已确认预约，无法再次确认"; } if (list.Where(x => x.State == Common.Enum.Course.CourseAppointStateEnum.WaitSure).Count()<=0)
if (!list.Any()) { return "不存在预约，无法确认"; } {
return "已确认预约，无法再次确认";
}
if (!list.Any())
{
return "不存在预约，无法确认";
}
//写入计划 //写入计划
var firstModel = list.FirstOrDefault(); var firstModel = list.FirstOrDefault();
if (list.Where(x => x.AppointType != 3).Count() < firstModel.ScrollMinNum) { return "最小成班人数:" + firstModel.ScrollMinNum; } if (list.Where(x => x.AppointType != 3).Count() < firstModel.ScrollMinNum)
{
return "最小成班人数:" + firstModel.ScrollMinNum;
}
int planId = class_PlanRepository.Insert(new RB_Class_Plan() var planList = class_PlanRepository.GetClassPlanListRepository(new RB_Class_Plan_ViewModel()
{
Group_Id = userInfo.Group_Id,
School_Id = firstModel.RoomSchoolId,
TeacherId = firstModel.TeacherId,
ClassRoomId = firstModel.RoomId,
PlanType = 2,
QClassDateStr = Common.ConvertHelper.FormatDate(firstModel.Date)
});
var planModel = new RB_Class_Plan()
{ {
ClassPlanId = 0, ClassPlanId = 0,
ClassId = 0, ClassId = 0,
...@@ -1816,7 +1835,46 @@ namespace Edu.Module.Course ...@@ -1816,7 +1835,46 @@ namespace Edu.Module.Course
RepeatPlanIds = "", RepeatPlanIds = "",
PlanType = 2, PlanType = 2,
CourseId = firstModel.CourseId CourseId = firstModel.CourseId
};
var CourseTimeList = JsonHelper.DeserializeObject<List<CourseTimeModel>>(firstModel.CourseTime);
var oldModel = planList?.FirstOrDefault(qitem => qitem.Group_Id == planModel.Group_Id
&& qitem.School_Id == planModel.School_Id
&& qitem.TeacherId == planModel.TeacherId
&& qitem.ClassRoomId == planModel.ClassRoomId
&& Common.ConvertHelper.FormatDate(qitem.ClassDate) == Common.ConvertHelper.FormatDate(planModel.ClassDate)
&& qitem.PlanType == 2
&& qitem.StartTime == CourseTimeList.FirstOrDefault().StartTime
&& qitem.EndTime == CourseTimeList.FirstOrDefault().EndTime
&& qitem.CourseId == planModel.CourseId);
planModel.ClassPlanId = oldModel?.ClassPlanId ?? 0;
if (planModel.ClassPlanId > 0)
{
}
else
{
int planId = class_PlanRepository.Insert( planModel);
planModel.ClassPlanId = planId;
//写入时间
foreach (var citem in CourseTimeList)
{
class_TimeRepository.Insert(new RB_Class_Time()
{
ClassTimeId = 0,
ClassId = 0,
ClassPlanId = planModel.ClassPlanId,
StartTime = citem.StartTime,
EndTime = citem.EndTime,
Group_Id = userInfo.Group_Id,
School_Id = firstModel.RoomSchoolId,//暂时 应该要赋值 订单上的预约校区
ClassStatus = 0,
SuiPai = "",
VideoUrl = "",
TimeHour = citem.ClassHours
}); });
}
}
#region 获取token 推送订阅消息 #region 获取token 推送订阅消息
...@@ -1842,34 +1900,14 @@ namespace Edu.Module.Course ...@@ -1842,34 +1900,14 @@ namespace Edu.Module.Course
} }
#endregion #endregion
if (planId > 0) if (planModel.ClassPlanId > 0)
{
var CourseTimeList = JsonHelper.DeserializeObject<List<CourseTimeModel>>(firstModel.CourseTime);
//写入时间
foreach (var citem in CourseTimeList)
{
class_TimeRepository.Insert(new RB_Class_Time()
{ {
ClassTimeId = 0,
ClassId = 0,
ClassPlanId = planId,
StartTime = citem.StartTime,
EndTime = citem.EndTime,
Group_Id = userInfo.Group_Id,
School_Id = firstModel.RoomSchoolId,//暂时 应该要赋值 订单上的预约校区
ClassStatus = 0,
SuiPai = "",
VideoUrl = "",
TimeHour = citem.ClassHours
});
}
foreach (var item in list) foreach (var item in list)
{ {
Dictionary<string, object> keyValues = new Dictionary<string, object>() Dictionary<string, object> keyValues = new Dictionary<string, object>()
{ {
{ nameof(RB_Scroll_Appointment_ViewModel.State), Common.Enum.Course.CourseAppointStateEnum.WaitCourse}, { nameof(RB_Scroll_Appointment_ViewModel.State), Common.Enum.Course.CourseAppointStateEnum.WaitCourse},
{ nameof(RB_Scroll_Appointment_ViewModel.ClassPlanId), planId}, { nameof(RB_Scroll_Appointment_ViewModel.ClassPlanId), planModel.ClassPlanId},
{ nameof(RB_Scroll_Appointment_ViewModel.UpdateBy), userInfo.Id}, { nameof(RB_Scroll_Appointment_ViewModel.UpdateBy), userInfo.Id},
{ nameof(RB_Scroll_Appointment_ViewModel.UpdateTime), DateTime.Now} { nameof(RB_Scroll_Appointment_ViewModel.UpdateTime), DateTime.Now}
}; };
...@@ -3055,11 +3093,14 @@ namespace Edu.Module.Course ...@@ -3055,11 +3093,14 @@ namespace Edu.Module.Course
bool flag = false; bool flag = false;
foreach (var item in appointList) foreach (var item in appointList)
{ {
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Scroll_Appointment_ViewModel.RoomId), roomId} { nameof(RB_Scroll_Appointment_ViewModel.RoomId), roomId}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName = nameof(RB_Scroll_Appointment_ViewModel.Id), FiledName = nameof(RB_Scroll_Appointment_ViewModel.Id),
FiledValue = item.Id, FiledValue = item.Id,
OperatorEnum =OperatorEnum.Equal OperatorEnum =OperatorEnum.Equal
...@@ -3073,11 +3114,14 @@ namespace Edu.Module.Course ...@@ -3073,11 +3114,14 @@ namespace Edu.Module.Course
if (appointModel.State == Common.Enum.Course.CourseAppointStateEnum.WaitCourse || appointModel.State == Common.Enum.Course.CourseAppointStateEnum.Coursed) if (appointModel.State == Common.Enum.Course.CourseAppointStateEnum.WaitCourse || appointModel.State == Common.Enum.Course.CourseAppointStateEnum.Coursed)
{ {
//待上课 需要更新 上课计划 class_plan //待上课 需要更新 上课计划 class_plan
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Class_Plan_ViewModel.ClassRoomId), roomId} { nameof(RB_Class_Plan_ViewModel.ClassRoomId), roomId}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName = nameof(RB_Class_Plan_ViewModel.ClassPlanId), FiledName = nameof(RB_Class_Plan_ViewModel.ClassPlanId),
FiledValue = appointModel.ClassPlanId, FiledValue = appointModel.ClassPlanId,
OperatorEnum =OperatorEnum.Equal OperatorEnum =OperatorEnum.Equal
...@@ -3091,11 +3135,103 @@ namespace Edu.Module.Course ...@@ -3091,11 +3135,103 @@ namespace Edu.Module.Course
var checkList = class_CheckRepository.GetClassCheckListRepository(new RB_Class_Check_ViewModel() { Group_Id = userInfo.Group_Id, QClassPlanIds = appointModel.ClassPlanId.ToString() }); var checkList = class_CheckRepository.GetClassCheckListRepository(new RB_Class_Check_ViewModel() { Group_Id = userInfo.Group_Id, QClassPlanIds = appointModel.ClassPlanId.ToString() });
foreach (var qitem in checkList) foreach (var qitem in checkList)
{ {
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Class_Check_ViewModel.ClassRoomId), roomId} { nameof(RB_Class_Check_ViewModel.ClassRoomId), roomId}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName = nameof(RB_Class_Check_ViewModel.ClassCheckId),
FiledValue = qitem.ClassCheckId,
OperatorEnum =OperatorEnum.Equal
}
};
class_CheckRepository.Update(keyValues, wheres);
}
}
if (MessageCenterHub.GlobalContext != null)
{
await MessageCenterHub.GlobalContext.Clients.All.SendAsync("ChangePlan", "55555555 ");
}
}
}
return "";
}
/// <summary>
/// 修改上课老师
/// </summary>
/// <param name="teacherId"></param>
/// <param name="date"></param>
/// <param name="shiftSort"></param>
/// <param name="NewTeacherId"></param>
/// <param name="userInfo"></param>
/// <returns></returns>
public async Task<string> SetScrollTeacherAsync(int teacherId, string date, string shiftSort, int NewTeacherId, UserInfo userInfo)
{
var appointList = scroll_AppointmentRepository.GetList(new RB_Scroll_Appointment_ViewModel() { Group_Id = userInfo.Group_Id, StartTime = date, EntTime = date, TeacherId = teacherId, ShiftSort = shiftSort });
if (appointList.Any())
{
if (appointList.Where(x => x.TeacherId == NewTeacherId).Any())
{
return "请选择其他老师";
}
var accountModel= accountRepository.GetAccountListRepository(new RB_Account_ViewModel() { AccountType = Common.Enum.User.AccountTypeEnum.Teacher, AccountId = NewTeacherId }).FirstOrDefault();
bool flag = false;
foreach (var item in appointList)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Scroll_Appointment_ViewModel.AccountId), accountModel.Id}
};
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{
FiledName = nameof(RB_Scroll_Appointment_ViewModel.Id),
FiledValue = item.Id,
OperatorEnum =OperatorEnum.Equal
}
};
flag = scroll_AppointmentRepository.Update(keyValues, wheres);
}
if (flag)
{
var appointModel = appointList.FirstOrDefault();
if (appointModel.State == Common.Enum.Course.CourseAppointStateEnum.WaitCourse || appointModel.State == Common.Enum.Course.CourseAppointStateEnum.Coursed)
{
//待上课 需要更新 上课计划 class_plan
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Class_Plan_ViewModel.TeacherId), teacherId}
};
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{
FiledName = nameof(RB_Class_Plan_ViewModel.ClassPlanId),
FiledValue = appointModel.ClassPlanId,
OperatorEnum =OperatorEnum.Equal
}
};
class_PlanRepository.Update(keyValues, wheres);
}
if (appointModel.State == Common.Enum.Course.CourseAppointStateEnum.Coursed)
{
//已上课 需要更新 签到数据 class_check
var checkList = class_CheckRepository.GetClassCheckListRepository(new RB_Class_Check_ViewModel() { Group_Id = userInfo.Group_Id, QClassPlanIds = appointModel.ClassPlanId.ToString() });
foreach (var qitem in checkList)
{
Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Class_Check_ViewModel.TeacherId), teacherId}
};
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{
FiledName = nameof(RB_Class_Check_ViewModel.ClassCheckId), FiledName = nameof(RB_Class_Check_ViewModel.ClassCheckId),
FiledValue = qitem.ClassCheckId, FiledValue = qitem.ClassCheckId,
OperatorEnum =OperatorEnum.Equal OperatorEnum =OperatorEnum.Equal
......
Edu.WebApi/Controllers/Course/ScrollController.cs
View file @ ac1d12a6
...@@ -1062,23 +1062,21 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1062,23 +1062,21 @@ namespace Edu.WebApi.Controllers.Course
string Date = base.ParmJObj.GetStringValue("Date"); string Date = base.ParmJObj.GetStringValue("Date");
string ShiftSort = base.ParmJObj.GetStringValue("ShiftSort"); string ShiftSort = base.ParmJObj.GetStringValue("ShiftSort");
int NewTeacherId = base.ParmJObj.GetInt("NewTeacherId", 0); int NewTeacherId = base.ParmJObj.GetInt("NewTeacherId", 0);
if (TeacherId <= 0 || NewTeacherId <= 0 || string.IsNullOrEmpty(Date) || string.IsNullOrEmpty(ShiftSort)) if (TeacherId <= 0 || NewTeacherId <= 0 || string.IsNullOrEmpty(Date) || string.IsNullOrEmpty(ShiftSort))
{ {
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
string msg = scrollClassModule.SetScrollTeacherAsync(TeacherId, Date, ShiftSort, NewTeacherId, userInfo).Result;
//string msg = scrollClassModule.SetScrollTeacher(TeacherId, Date, ShiftSort, NewTeacherId, userInfo); if (msg == "")
//if (msg == "") {
//{
// return ApiResult.Success();
//}
//else
//{
// return ApiResult.Failed(msg);
//}
return ApiResult.Success(); return ApiResult.Success();
} }
else
{
return ApiResult.Failed(msg);
}
}
/// <summary> /// <summary>
/// 修改约课教室 /// 修改约课教室
...@@ -1092,12 +1090,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1092,12 +1090,10 @@ namespace Edu.WebApi.Controllers.Course
string Date = base.ParmJObj.GetStringValue("Date"); string Date = base.ParmJObj.GetStringValue("Date");
string ShiftSort = base.ParmJObj.GetStringValue("ShiftSort"); string ShiftSort = base.ParmJObj.GetStringValue("ShiftSort");
int RoomId = base.ParmJObj.GetInt("RoomId", 0);//新教室ID int RoomId = base.ParmJObj.GetInt("RoomId", 0);//新教室ID
if (TeacherId <= 0 || RoomId <= 0 || string.IsNullOrEmpty(Date) || string.IsNullOrEmpty(ShiftSort)) if (TeacherId <= 0 || RoomId <= 0 || string.IsNullOrEmpty(Date) || string.IsNullOrEmpty(ShiftSort))
{ {
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
string msg = scrollClassModule.SetScrollRoomAsync(TeacherId, Date, ShiftSort, RoomId, userInfo).Result; string msg = scrollClassModule.SetScrollRoomAsync(TeacherId, Date, ShiftSort, RoomId, userInfo).Result;
if (msg == "") if (msg == "")
{ {
......
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