Skip to content

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

提交代码

parent 45879014
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 73 deletions
Edu.Model/ViewModel/EduTask/RB_Change_ClassPlan_ViewModel.cs
View file @ b2464cd7
...@@ -100,7 +100,7 @@ namespace Edu.Model.ViewModel.EduTask ...@@ -100,7 +100,7 @@ namespace Edu.Model.ViewModel.EduTask
/// <summary> /// <summary>
/// 默认选中的日期、周 /// 默认选中的日期、周
/// </summary> /// </summary>
public string DateJson { get; set; } //public string DateJson { get; set; }
/// <summary> /// <summary>
...@@ -112,7 +112,7 @@ namespace Edu.Model.ViewModel.EduTask ...@@ -112,7 +112,7 @@ namespace Edu.Model.ViewModel.EduTask
/// <summary> /// <summary>
/// 默认时间字符串JSON /// 默认时间字符串JSON
/// </summary> /// </summary>
public string DefaultTimeJson { get; set; } // public string DefaultTimeJson { get; set; }
} }
///<summary> ///<summary>
......
Edu.WebApi/Controllers/EduTask/ChangePlanController.cs
View file @ b2464cd7
...@@ -101,74 +101,6 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -101,74 +101,6 @@ namespace Edu.WebApi.Controllers.EduTask
{ {
if (model.ChangeType == 1) if (model.ChangeType == 1)
{ {
//排课方式
try
{
// string WeekDayListStr = model.AllChangePlanModel.WeekDayList; // base.ParmJObj.GetStringValue("WeekDayList");
switch (model.AllChangePlanModel.ClassStyle)
{
//按周排课
case ClassStyleEnum.Week:
if (model.AllChangePlanModel.WeekDayList != null && model.AllChangePlanModel.WeekDayList.Any())
{
// model.AllChangePlanModel.WeekDayList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(WeekDayListStr);
model.AllChangePlanModel.DateJson = Common.Plugin.JsonHelper.Serialize(model.AllChangePlanModel.WeekDayList);
}
else
{
model.AllChangePlanModel.DateJson = "";
}
break;
//固定日期排课
case ClassStyleEnum.FixedDate:
if (model.AllChangePlanModel.WeekDayList != null && model.AllChangePlanModel.WeekDayList.Any())
{
// model.AllChangePlanModel.WeekDayList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(WeekDayListStr);
model.AllChangePlanModel.DateJson = Common.Plugin.JsonHelper.Serialize(model.AllChangePlanModel.WeekDayList);
}
else
{
model.AllChangePlanModel.DateJson = "";
}
break;
//按月排课
case ClassStyleEnum.Month:
if (model.AllChangePlanModel.WeekDayList != null && model.AllChangePlanModel.WeekDayList.Any())
{
// model.AllChangePlanModel.WeekDayList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(WeekDayListStr);
model.AllChangePlanModel.DateJson = Common.Plugin.JsonHelper.Serialize(model.AllChangePlanModel.WeekDayList);
}
else
{
model.AllChangePlanModel.DateJson = "";
}
break;
//网约课
case ClassStyleEnum.OnLine:
model.AllChangePlanModel.DateJson = "";
break;
}
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SetChangeClassPlan");
}
//try
//{
// string DefaultPlanTimeListStr = base.ParmJObj.GetStringValue("DefaultPlanTimeList");
// if (!string.IsNullOrEmpty(DefaultPlanTimeListStr))
// {
// model.AllChangePlanModel.DefaultTimeList = Common.Plugin.JsonHelper.DeserializeObject<List<Edu.Model.ViewModel.EduTask.ClassTimeItem>>(DefaultPlanTimeListStr);
// }
// else
// {
// return ApiResult.Failed("请输入上课时间");
// }
//}
//catch (Exception ex)
//{
// Common.Plugin.LogHelper.Write(ex, "SetClass_DefaultPlanTimeList");
//}
List<string> dayList = new List<string>(); List<string> dayList = new List<string>();
if (model.AllChangePlanModel.DefaultTimeList != null && model.AllChangePlanModel.DefaultTimeList.Count > 0) if (model.AllChangePlanModel.DefaultTimeList != null && model.AllChangePlanModel.DefaultTimeList.Count > 0)
{ {
...@@ -233,7 +165,6 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -233,7 +165,6 @@ namespace Edu.WebApi.Controllers.EduTask
} }
return ApiResult.ParamIsNull(message: "学习时间段" + (tempStr) + message2.TrimStart(',') + "重复!"); return ApiResult.ParamIsNull(message: "学习时间段" + (tempStr) + message2.TrimStart(',') + "重复!");
} }
model.AllChangePlanModel.DefaultTimeJson = Common.Plugin.JsonHelper.Serialize(model.AllChangePlanModel.DefaultTimeList);
} }
else else
{ {
...@@ -250,10 +181,8 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -250,10 +181,8 @@ namespace Edu.WebApi.Controllers.EduTask
} }
else else
{ {
return ApiResult.Failed("班级信息不存在"); return ApiResult.Failed("班级信息不存在");
} }
} }
else if (model.ChangeType == 2) else if (model.ChangeType == 2)
{ {
......
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