Skip to content

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

页面修改

parent f69db26a
Hide whitespace changes
Inline Side-by-side
Showing with 170 additions and 106 deletions
Edu.Module.Course/ClassModule.cs
View file @ 37941180
...@@ -389,6 +389,9 @@ namespace Edu.Module.Course ...@@ -389,6 +389,9 @@ namespace Edu.Module.Course
{ {
subItem.ClassTimeId = 0; subItem.ClassTimeId = 0;
subItem.ClassPlanId = newClassPlanId; subItem.ClassPlanId = newClassPlanId;
subItem.ClassId = model.ClassId;
subItem.Group_Id = model.Group_Id;
subItem.School_Id = model.School_Id;
//添加班级上课计划的上课时间 //添加班级上课计划的上课时间
class_TimeRepository.Insert(subItem); class_TimeRepository.Insert(subItem);
} }
...@@ -476,35 +479,143 @@ namespace Edu.Module.Course ...@@ -476,35 +479,143 @@ namespace Edu.Module.Course
var flag2 = class_PlanRepository.DeleteClassPlanRepository(ids); var flag2 = class_PlanRepository.DeleteClassPlanRepository(ids);
} }
} }
List<RB_Class_Plan_ViewModel> classPlanList = new List<RB_Class_Plan_ViewModel>(); List<RB_Class_Plan_ViewModel> classPlanList = new List<RB_Class_Plan_ViewModel>();
if (model.ClassHours > 0) if (model.ClassHours > 0)
{ {
var srartDate = model.OpenTime; var srartDate = model.OpenTime;
List<RB_Class_Time_ViewModel> PlanTimeList = new List<RB_Class_Time_ViewModel>(); //按周排课和按月排课
int i = 0; if (model.ClassStyle == ClassStyleEnum.Week || model.ClassStyle == ClassStyleEnum.Month)
double totalHours = 0;
foreach (var rootItem in defaultPlanTimeList)
{ {
PlanTimeList = new List<RB_Class_Time_ViewModel>(); int i = 0;
double dayHours = 0;//每一天课时 double totalHours = 0;
double dayMinutes = 0;//每一天上课分钟数 while (model.ClassHours > totalHours)
foreach (var sItem in rootItem.TimeList)
{ {
var startDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " " + sItem.StartTime + ":00"); var newDate = srartDate.AddDays(i);
var endDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " " + sItem.EndTime + ":00"); foreach (var item in model.WeekDayList)
TimeSpan span = endDate.Subtract(startDate);
if (span.TotalMinutes > 0)
{ {
dayMinutes += span.TotalMinutes; var planModel = new RB_Class_Plan_ViewModel()
{
ClassId = model.ClassId,
ClassPlanId = 0,
ClassRoomId = model.ClassRoomId,
Group_Id = model.Group_Id,
School_Id = model.School_Id,
PlanTimeList = new List<RB_Class_Time_ViewModel>(),
TeacherId = model.Teacher_Id,
ClassDate = newDate
};
if (model.ClassStyle == ClassStyleEnum.Week)
{
switch (item)
{
case "1":
if (newDate.DayOfWeek == DayOfWeek.Monday)
{
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
totalHours += dayHours;
classPlanList.Add(planModel);
}
}
break;
case "2":
if (newDate.DayOfWeek == DayOfWeek.Tuesday)
{
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
totalHours += dayHours;
classPlanList.Add(planModel);
}
}
break;
case "3":
if (newDate.DayOfWeek == DayOfWeek.Wednesday)
{
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
totalHours += dayHours;
classPlanList.Add(planModel);
}
}
break;
case "4":
if (newDate.DayOfWeek == DayOfWeek.Thursday)
{
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
totalHours += dayHours;
classPlanList.Add(planModel);
}
}
break;
case "5":
if (newDate.DayOfWeek == DayOfWeek.Friday)
{
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
totalHours += dayHours;
classPlanList.Add(planModel);
}
}
break;
case "6":
if (newDate.DayOfWeek == DayOfWeek.Saturday)
{
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
totalHours += dayHours;
classPlanList.Add(planModel);
}
}
break;
case "7":
if (newDate.DayOfWeek == DayOfWeek.Sunday)
{
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
totalHours += dayHours;
classPlanList.Add(planModel);
}
}
break;
}
}
else if (model.ClassStyle == ClassStyleEnum.Month)
{
if (newDate.Day == Convert.ToInt32(item))
{
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList);
totalHours += dayHours;
classPlanList.Add(planModel);
}
}
}
} }
PlanTimeList.Add(new RB_Class_Time_ViewModel() i++;
{
StartTime = sItem.StartTime,
EndTime = sItem.EndTime
});
} }
dayHours = dayMinutes / 45.0; }
foreach (var item in rootItem.DateList) //固定日期
else if (model.ClassStyle == ClassStyleEnum.FixedDate)
{
foreach (var item in model.WeekDayList)
{ {
var planModel = new RB_Class_Plan_ViewModel() var planModel = new RB_Class_Plan_ViewModel()
{ {
...@@ -513,102 +624,55 @@ namespace Edu.Module.Course ...@@ -513,102 +624,55 @@ namespace Edu.Module.Course
ClassRoomId = model.ClassRoomId, ClassRoomId = model.ClassRoomId,
Group_Id = model.Group_Id, Group_Id = model.Group_Id,
School_Id = model.School_Id, School_Id = model.School_Id,
PlanTimeList = PlanTimeList, PlanTimeList = new List<RB_Class_Time_ViewModel>(),
TeacherId = model.Teacher_Id, TeacherId = model.Teacher_Id,
ClassDate = Convert.ToDateTime(item)
}; };
//按周排课和按月排课 var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (model.ClassStyle == ClassStyleEnum.Week || model.ClassStyle == ClassStyleEnum.Month) if (timeList != null && timeList.Count > 0)
{ {
while (model.ClassHours > totalHours) CalcDayClassHoursModule(timeList,planModel.PlanTimeList);
{
var newDate = srartDate.AddDays(i);
foreach (var dItem in rootItem.DateList)
{
planModel.ClassDate = newDate;
if (model.ClassStyle == ClassStyleEnum.Week)
{
switch (item)
{
case "1":
if (newDate.DayOfWeek == DayOfWeek.Monday)
{
classPlanList.Add(planModel);
totalHours += dayHours;
}
break;
case "2":
if (newDate.DayOfWeek == DayOfWeek.Tuesday)
{
classPlanList.Add(planModel);
totalHours += dayHours;
}
break;
case "3":
if (newDate.DayOfWeek == DayOfWeek.Wednesday)
{
classPlanList.Add(planModel);
totalHours += dayHours;
}
break;
case "4":
if (newDate.DayOfWeek == DayOfWeek.Thursday)
{
classPlanList.Add(planModel);
totalHours += dayHours;
}
break;
case "5":
if (newDate.DayOfWeek == DayOfWeek.Friday)
{
classPlanList.Add(planModel);
totalHours += dayHours;
}
break;
case "6":
if (newDate.DayOfWeek == DayOfWeek.Saturday)
{
classPlanList.Add(planModel);
totalHours += dayHours;
}
break;
case "7":
if (newDate.DayOfWeek == DayOfWeek.Sunday)
{
classPlanList.Add(planModel);
totalHours += dayHours;
}
break;
}
}
else
{
if (newDate.Day == Convert.ToInt32(item))
{
classPlanList.Add(planModel);
totalHours += dayHours;
}
}
i++;
}
}
}
//固定日期
else if (model.ClassStyle == ClassStyleEnum.FixedDate)
{
planModel.ClassDate = Convert.ToDateTime(item);
classPlanList.Add(planModel); classPlanList.Add(planModel);
} }
//约课
else
{
}
} }
} }
//约课
else
{
}
} }
return classPlanList; return classPlanList;
} }
/// <summary>
/// 计算每天课时
/// </summary>
/// <param name="timeList"></param>
/// <returns></returns>
private double CalcDayClassHoursModule(List<TimeItem> timeList,List<RB_Class_Time_ViewModel> classTimeList)
{
double dayMinutes = 0;
foreach (var sItem in timeList)
{
classTimeList.Add(new RB_Class_Time_ViewModel()
{
StartTime = sItem.StartTime,
EndTime = sItem.EndTime
});
var startDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " " + sItem.StartTime + ":00");
var endDate = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd") + " " + sItem.EndTime + ":00");
TimeSpan span = endDate.Subtract(startDate);
if (span.TotalMinutes > 0)
{
dayMinutes += span.TotalMinutes;
}
}
double dayClassHours = dayMinutes / 45.0;
return dayClassHours;
}
/// <summary> /// <summary>
/// 根据班级编号获取班级详细信息 /// 根据班级编号获取班级详细信息
/// </summary> /// </summary>
......
Edu.Module.Course/OrderModule.cs
View file @ 37941180
...@@ -294,7 +294,7 @@ namespace Edu.Module.Course ...@@ -294,7 +294,7 @@ namespace Edu.Module.Course
} }
else else
{ {
message = "此课程未配置【优惠/少价】信息，请通知OP在课程里面添加优惠信息!"; message = "此课程未配置【销售提成】信息，请通知OP在课程里面添加优惠信息!";
return flag; return flag;
} }
} }
......
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