Skip to content

E
Education
Commit a9c08110 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents f211bd6d 9833fb3c
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 36 deletions
Edu.Module.Course/ClassModule.cs
View file @ a9c08110
...@@ -13,6 +13,7 @@ using Edu.Repository.User; ...@@ -13,6 +13,7 @@ using Edu.Repository.User;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks;
using VT.FW.DB; using VT.FW.DB;
namespace Edu.Module.Course namespace Edu.Module.Course
...@@ -429,8 +430,22 @@ namespace Edu.Module.Course ...@@ -429,8 +430,22 @@ namespace Edu.Module.Course
//班级上课计划列表 //班级上课计划列表
List<RB_Class_Plan_ViewModel> classPlanList = CreateClassPlanList(model, defaultPlanTimeList); List<RB_Class_Plan_ViewModel> classPlanList = CreateClassPlanList(model, defaultPlanTimeList);
model.ClassPlanList = classPlanList; model.ClassPlanList = classPlanList;
AddClassPlanModule(model);
#endregion
return flag;
}
/// <summary>
/// 添加上课计划
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
public void AddClassPlanModule(RB_Class_ViewModel model)
{
Task.Run(() =>
{
if (model.ClassPlanList != null && model.ClassPlanList.Count > 0) if (model.ClassPlanList != null && model.ClassPlanList.Count > 0)
{ {
foreach (var item in model.ClassPlanList) foreach (var item in model.ClassPlanList)
...@@ -456,9 +471,7 @@ namespace Edu.Module.Course ...@@ -456,9 +471,7 @@ namespace Edu.Module.Course
} }
} }
} }
#endregion });
return flag;
} }
/// <summary> /// <summary>
...@@ -550,6 +563,7 @@ namespace Edu.Module.Course ...@@ -550,6 +563,7 @@ namespace Edu.Module.Course
if (model.ClassHours > 0) if (model.ClassHours > 0)
{ {
var srartDate = model.OpenTime; var srartDate = model.OpenTime;
var BasicMinutes= class_ConfigRepository.GetBasicMinutesRepository(model.Group_Id);
//按周排课和按月排课 //按周排课和按月排课
if (model.ClassStyle == ClassStyleEnum.Week || model.ClassStyle == ClassStyleEnum.Month) if (model.ClassStyle == ClassStyleEnum.Week || model.ClassStyle == ClassStyleEnum.Month)
{ {
...@@ -581,7 +595,7 @@ namespace Edu.Module.Course ...@@ -581,7 +595,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList; var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0) if (timeList != null && timeList.Count > 0)
{ {
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model); var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model, BasicMinutes);
totalHours += dayHours; totalHours += dayHours;
classPlanList.Add(planModel); classPlanList.Add(planModel);
} }
...@@ -593,7 +607,7 @@ namespace Edu.Module.Course ...@@ -593,7 +607,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList; var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0) if (timeList != null && timeList.Count > 0)
{ {
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model); var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model, BasicMinutes);
totalHours += dayHours; totalHours += dayHours;
classPlanList.Add(planModel); classPlanList.Add(planModel);
} }
...@@ -605,7 +619,7 @@ namespace Edu.Module.Course ...@@ -605,7 +619,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList; var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0) if (timeList != null && timeList.Count > 0)
{ {
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model); var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model, BasicMinutes);
totalHours += dayHours; totalHours += dayHours;
classPlanList.Add(planModel); classPlanList.Add(planModel);
} }
...@@ -617,7 +631,7 @@ namespace Edu.Module.Course ...@@ -617,7 +631,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList; var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0) if (timeList != null && timeList.Count > 0)
{ {
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model); var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model, BasicMinutes);
totalHours += dayHours; totalHours += dayHours;
classPlanList.Add(planModel); classPlanList.Add(planModel);
} }
...@@ -629,7 +643,7 @@ namespace Edu.Module.Course ...@@ -629,7 +643,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList; var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0) if (timeList != null && timeList.Count > 0)
{ {
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model); var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model, BasicMinutes);
totalHours += dayHours; totalHours += dayHours;
classPlanList.Add(planModel); classPlanList.Add(planModel);
} }
...@@ -641,7 +655,7 @@ namespace Edu.Module.Course ...@@ -641,7 +655,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList; var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0) if (timeList != null && timeList.Count > 0)
{ {
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model); var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model, BasicMinutes);
totalHours += dayHours; totalHours += dayHours;
classPlanList.Add(planModel); classPlanList.Add(planModel);
} }
...@@ -653,7 +667,7 @@ namespace Edu.Module.Course ...@@ -653,7 +667,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList; var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0) if (timeList != null && timeList.Count > 0)
{ {
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model); var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model,BasicMinutes);
totalHours += dayHours; totalHours += dayHours;
classPlanList.Add(planModel); classPlanList.Add(planModel);
} }
...@@ -668,7 +682,7 @@ namespace Edu.Module.Course ...@@ -668,7 +682,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList; var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0) if (timeList != null && timeList.Count > 0)
{ {
var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model); var dayHours = CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model,BasicMinutes);
totalHours += dayHours; totalHours += dayHours;
classPlanList.Add(planModel); classPlanList.Add(planModel);
} }
...@@ -697,7 +711,7 @@ namespace Edu.Module.Course ...@@ -697,7 +711,7 @@ namespace Edu.Module.Course
var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList; var timeList = defaultPlanTimeList.Where(qitem => qitem.DateList.Contains(item))?.FirstOrDefault()?.TimeList;
if (timeList != null && timeList.Count > 0) if (timeList != null && timeList.Count > 0)
{ {
CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model); CalcDayClassHoursModule(timeList, planModel.PlanTimeList, model, BasicMinutes);
classPlanList.Add(planModel); classPlanList.Add(planModel);
} }
} }
...@@ -718,7 +732,7 @@ namespace Edu.Module.Course ...@@ -718,7 +732,7 @@ namespace Edu.Module.Course
/// <param name="classTimeList"></param> /// <param name="classTimeList"></param>
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
private double CalcDayClassHoursModule(List<TimeItem> timeList, List<RB_Class_Time_ViewModel> classTimeList, RB_Class_ViewModel model) private double CalcDayClassHoursModule(List<TimeItem> timeList, List<RB_Class_Time_ViewModel> classTimeList, RB_Class_ViewModel model,int BasicMinutes)
{ {
double dayClassHours = 0; double dayClassHours = 0;
double dayMinutes = 0; double dayMinutes = 0;
...@@ -743,7 +757,7 @@ namespace Edu.Module.Course ...@@ -743,7 +757,7 @@ namespace Edu.Module.Course
} }
else else
{ {
dayClassHours = dayMinutes / class_ConfigRepository.GetBasicMinutesRepository(model.Group_Id); dayClassHours = dayMinutes / BasicMinutes;
} }
return dayClassHours; return dayClassHours;
} }
......
Edu.Repository/Course/RB_Class_PlanRepository.cs
View file @ a9c08110
...@@ -313,10 +313,10 @@ WHERE a.`Status`=0 and DATE_FORMAT(a.ClassDate,'%Y-%m-%d')<=DATE_FORMAT(NOW(),' ...@@ -313,10 +313,10 @@ WHERE a.`Status`=0 and DATE_FORMAT(a.ClassDate,'%Y-%m-%d')<=DATE_FORMAT(NOW(),'
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Group_Id), query.Group_Id); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.Group_Id), query.Group_Id);
} }
if (query.School_Id > 0) //if (query.School_Id > 0)
{ //{
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id); // builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.School_Id), query.School_Id);
} //}
if (query.ClassId > 0) if (query.ClassId > 0)
{ {
builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassId), query.ClassId); builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_Class_Plan_ViewModel.ClassId), query.ClassId);
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ a9c08110
...@@ -732,7 +732,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -732,7 +732,7 @@ namespace Edu.WebApi.Controllers.Course
var classPlanId = base.ParmJObj.GetInt("ClassPlanId"); var classPlanId = base.ParmJObj.GetInt("ClassPlanId");
var schoolId = base.ParmJObj.GetInt("School_Id"); var schoolId = base.ParmJObj.GetInt("School_Id");
var ClassTimeId = base.ParmJObj.GetInt("ClassTimeId"); var ClassTimeId = base.ParmJObj.GetInt("ClassTimeId");
if (classId == 0 || classPlanId == 0 || schoolId == 0) if (classId == 0 || classPlanId == 0 )
{ {
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
......
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