Skip to content

E
Education
Commit 67df7f54 authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent df8b3b3e
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 20 deletions
Edu.Model/ViewModel/Course/RB_Class_Time_ViewModel.cs
View file @ 67df7f54
......@@ -23,6 +23,12 @@ namespace Edu.Model.ViewModel.Course
/// </summary>
public string NewPlanDateTime { get; set; }
/// <summary>
/// 上课时间【日期+结束时间】
/// </summary>
public string NewEndPlanDateTime { get; set; }
/// <summary>
/// 随拍list
/// </summary>
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 67df7f54
......@@ -910,18 +910,25 @@ namespace Edu.WebApi.Controllers.Course
model.WeekStr = StringHelper.GetJapanWeekChar(planDate.ClassDate);
DateTime startTime = System.DateTime.Now;
DateTime endTime = System.DateTime.Now;
DateTime maxStarttime = System.DateTime.Now;
int planTimeNum = 0;
int jiangeTime = 0;
if (planTiemList != null && planTiemList.Any())
{
planTimeNum = planTiemList.Count();
planTiemList.ForEach(x => x.NewPlanDateTime = planDate.ClassDate.ToString("yyyy-MM-dd") + " " + x.StartTime);
planTiemList.ForEach(x => x.NewEndPlanDateTime = planDate.ClassDate.ToString("yyyy-MM-dd") + " " + x.EndTime);
model.DayTime = planTiemList.Min(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("HH:mm");
startTime = planTiemList.Min(x => Convert.ToDateTime(x.NewPlanDateTime));
endTime = planTiemList.Max(x => Convert.ToDateTime(x.NewPlanDateTime));
model.RestTime = endTime.Subtract(startTime).TotalMilliseconds.ToString();
planTiemList.ForEach(x => x.NewPlanDateTime = planDate.ClassDate.ToString("yyyy-MM-dd") + " " + x.EndTime);
model.DayTime = model.DayTime + "~" + planTiemList.Max(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("HH:mm");
model.ClassEndTime = planTiemList.Max(x => Convert.ToDateTime(x.NewPlanDateTime)).ToString("yyyy-MM-dd HH:mm:00");
maxStarttime = planTiemList.Max(x => Convert.ToDateTime(x.NewPlanDateTime));
endTime = planTiemList.Min(x => Convert.ToDateTime(x.NewEndPlanDateTime));
jiangeTime = Convert.ToInt32(maxStarttime.Subtract(startTime).TotalMinutes);
model.RestTime = maxStarttime.Subtract(endTime).TotalMinutes.ToString();
model.DayTime = model.DayTime + "~" + planTiemList.Max(x => Convert.ToDateTime(x.NewEndPlanDateTime)).ToString("HH:mm");
model.ClassEndTime = planTiemList.Max(x => Convert.ToDateTime(x.NewEndPlanDateTime)).ToString("yyyy-MM-dd HH:mm:00");
}
var lessonPlanList = classModule.GetLessonPlanListRepository(extModel);
model.ClassId = extModel.ClassId;
......@@ -943,29 +950,44 @@ namespace Edu.WebApi.Controllers.Course
model.LessonPlanList = new List<RB_Class_LessonPlan_ViewModel>();
model.LessonPlanList = lessonPlanList;
foreach (var item in model.LessonPlanList)
if (model.LessonPlanList != null && model.LessonPlanList.Any())
{
item.LessonPlanDetailsList = new List<RB_Class_LessonPlanDetails_ViewModel>();
item.LessonPlanProjectsList = new List<RB_Class_LessonPlanProjects_ViewModel>();
item.LessonPlanDetailsList = detailsList.Where(x => x.LessonPlanId == item.LessonPlanId).ToList();
foreach (var itemDetails in item.LessonPlanDetailsList)
int lessPlanDetailsId = model.LessonPlanList[0].LessonPlanId;
foreach (var item in model.LessonPlanList)
{
if (planTimeNum == 1)
item.LessonPlanDetailsList = new List<RB_Class_LessonPlanDetails_ViewModel>();
item.LessonPlanProjectsList = new List<RB_Class_LessonPlanProjects_ViewModel>();
item.LessonPlanDetailsList = detailsList.Where(x => x.LessonPlanId == item.LessonPlanId).ToList();
int tempDuration = 0;
if (item.LessonPlanDetailsList != null && item.LessonPlanDetailsList.Any())
{
itemDetails.DurationEndTime = startTime.AddMinutes(itemDetails.Duration).ToString("HH:mm");
}
else
{
itemDetails.DurationEndTime = (startTime.AddMinutes(itemDetails.Duration) < endTime) ? startTime.AddMinutes(itemDetails.Duration).ToString("HH:mm") : endTime.AddMinutes(itemDetails.Duration).ToString("HH:mm");
foreach (var itemDetails in item.LessonPlanDetailsList)
{
if (lessPlanDetailsId == itemDetails.LessonPlanId)
{
tempDuration += itemDetails.Duration;
}
else
{
tempDuration += (itemDetails.Duration + jiangeTime);
}
itemDetails.DurationEndTime = startTime.AddMinutes(tempDuration).ToString("HH:mm");
}
}
}
item.LessonPlanProjectsList = projectList.Where(x => x.LessonPlanId == item.LessonPlanId).ToList();
// item.LessonPlanProjectsList.ForEach(x => x.ProjectContentList = (string.IsNullOrWhiteSpace(x.ProjectContent) ? new List<string>() : Common.Plugin.JsonHelper.DeserializeObject<List<string>>(x.ProjectContent)));
model.IsEditSummary += item.LessonPlanDetailsList.Where(x => !string.IsNullOrWhiteSpace(x.Summary)).Count();
item.LessonPlanProjectsList = projectList.Where(x => x.LessonPlanId == item.LessonPlanId).ToList();
// item.LessonPlanProjectsList.ForEach(x => x.ProjectContentList = (string.IsNullOrWhiteSpace(x.ProjectContent) ? new List<string>() : Common.Plugin.JsonHelper.DeserializeObject<List<string>>(x.ProjectContent)));
model.IsEditSummary += item.LessonPlanDetailsList.Where(x => !string.IsNullOrWhiteSpace(x.Summary)).Count();
}
}
}
else
{
......
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