Skip to content

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

页面修改

parent 71240059
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 14 deletions
Edu.Model/Entity/Course/RB_Class.cs
View file @ d5344680
......@@ -198,5 +198,10 @@ namespace Edu.Model.Entity.Course
/// 上课人数
/// </summary>
public StudentNumTypeEnum? StudentNumType { get; set; }
/// <summary>
/// 课时分钟数
/// </summary>
public int ClassHourMinute { get; set; }
}
}
Edu.Module.Course/ClassModule.cs
View file @ d5344680
......@@ -325,6 +325,7 @@ namespace Edu.Module.Course
{ nameof(RB_Class_ViewModel.Point),model.Point},
{ nameof(RB_Class_ViewModel.CourseClassType),model.CourseClassType},
{ nameof(RB_Class_ViewModel.StudentNumType),model.StudentNumType},
{ nameof(RB_Class_ViewModel.ClassHourMinute),model.ClassHourMinute},
};
flag = classRepository.Update(fileds, new WhereHelper(nameof(RB_Class_ViewModel.ClassId), model.ClassId));
}
......@@ -456,6 +457,7 @@ namespace Edu.Module.Course
}
}
#endregion
return flag;
}
......@@ -579,7 +581,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList,planModel.Group_Id);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -591,7 +593,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -603,7 +605,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -615,7 +617,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -627,7 +629,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -639,7 +641,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -651,7 +653,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -666,7 +668,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model);
totalHours += dayHours;
classPlanList.Add(planModel);
}
......@@ -695,7 +697,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0)
{
CalcDayClassHoursModule(timeList, planModel.PlanTimeList, planModel.Group_Id);
CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model);
classPlanList.Add(planModel);
}
}
......@@ -713,9 +715,12 @@ namespace Edu.Module.Course
/// 计算每天课时
/// </summary>
/// <param name="timeList"></param>
/// <param name="classTimeList"></param>
/// <param name="model"></param>
/// <returns></returns>
private double CalcDayClassHoursModule(List<TimeItem> timeList, List<RB_Class_Time_ViewModel> classTimeList,int Group_Id)
private double CalcDayClassHoursModule(List<TimeItem> timeList, List<RB_Class_Time_ViewModel> classTimeList, RB_Class_ViewModel model)
{
double dayClassHours = 0;
double dayMinutes = 0;
foreach (var sItem in timeList)
{
......@@ -732,7 +737,10 @@ namespace Edu.Module.Course
dayMinutes += span.TotalMinutes;
}
}
double dayClassHours = dayMinutes / GetBasicMinutesModule(Group_Id);
if (model.ClassHourMinute > 0)
{
dayClassHours = dayMinutes / model.ClassHourMinute;
}
return dayClassHours;
}
......@@ -909,9 +917,6 @@ namespace Edu.Module.Course
return list;
}
/// <summary>
/// 根据计划编号删除上课计划
/// </summary>
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ d5344680
......@@ -190,6 +190,7 @@ namespace Edu.WebApi.Controllers.Course
Point = base.ParmJObj.GetInt("Point"),
CourseClassType = (CourseClassTypeEnum)base.ParmJObj.GetInt("CourseClassType"),
StudentNumType = (StudentNumTypeEnum)base.ParmJObj.GetInt("StudentNumType"),
ClassHourMinute=base.ParmJObj.GetInt("ClassHourMinute"),
};
try
{
......@@ -449,6 +450,7 @@ namespace Edu.WebApi.Controllers.Course
WeekDayList = extModel?.WeekDayList ?? new List<string>(),
CompleteProgress = extModel?.CompleteProgress ?? 0,
ClassStatusStr = extModel?.ClassStatusStr ?? "",
ClassHourMinute = extModel?.ClassHourMinute ?? 45,
};
return ApiResult.Success(data: obj);
}
......
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