Skip to content

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

页面修改

parent 5d2dffd3
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 37 deletions
Edu.Module.Course/OrderModule.cs
View file @ 83f8b8d6
......@@ -180,12 +180,12 @@ namespace Edu.Module.Course
foreach (var item in list)
{
item.ClassStepPriceList = stepList.Where(x => x.ClassId == item.ClassId).OrderBy(x => x.PersionNum).ToList();
item.ClassTimeList = new List<RB_Class_Time_ViewModel>();
item.DefaultTimeList = new List<ClassTimeItem>();
if (item.ClassStyle != Common.Enum.Course.ClassStyleEnum.OnLine)
{
if (!string.IsNullOrEmpty(item.DefaultTimeJson))
{
item.ClassTimeList = JsonHelper.DeserializeObject<List<RB_Class_Time_ViewModel>>(item.DefaultTimeJson);
item.DefaultTimeList = JsonHelper.DeserializeObject<List<ClassTimeItem>>(item.DefaultTimeJson);
}
}
item.ClassPlanList = new List<RB_Class_Plan_ViewModel>();
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 83f8b8d6
......@@ -265,6 +265,7 @@ namespace Edu.WebApi.Controllers.Course
{
Common.Plugin.LogHelper.Write(ex, "SetClass_DefaultPlanTimeList");
}
List<string> dayList = new List<string>();
if (extModel.DefaultTimeList != null && extModel.DefaultTimeList.Count > 0)
{
foreach (var rootItem in extModel.DefaultTimeList)
......@@ -273,6 +274,10 @@ namespace Edu.WebApi.Controllers.Course
{
return ApiResult.ParamIsNull(message: "请选择日期/周");
}
if (rootItem.DateList != null && rootItem.DateList.Count > 0)
{
dayList.AddRange(rootItem.DateList);
}
foreach (var item in rootItem.TimeList)
{
string message = "";
......@@ -294,6 +299,29 @@ namespace Edu.WebApi.Controllers.Course
}
}
}
var tempList =dayList.GroupBy(qitem => new { qitem }).Where(g => g.Count() > 1).Select(qitem => new { qitem.Key.qitem });
string message2 = "";
foreach (var sItem in tempList)
{
message2 += "," + sItem.qitem;
}
if (!string.IsNullOrEmpty(message2))
{
string tempStr = "";
if (extModel.ClassStyle == ClassStyleEnum.Week)
{
tempStr = "每周";
}
if (extModel.ClassStyle == ClassStyleEnum.Month)
{
tempStr = "每月";
}
if (extModel.ClassStyle == ClassStyleEnum.FixedDate)
{
tempStr = "固定日期";
}
return ApiResult.ParamIsNull(message:"学习时间段"+(tempStr)+ message2.TrimStart(',')+"重复!");
}
extModel.DefaultTimeJson = Common.Plugin.JsonHelper.Serialize(extModel.DefaultTimeList);
}
else
......@@ -325,7 +353,22 @@ namespace Edu.WebApi.Controllers.Course
}
if (dateList != null && dateList.Count > 0 && !string.IsNullOrEmpty(item.DefaultTimeJson))
{
var model = Common.Plugin.JsonHelper.DeserializeObject<ClassTimeItem>(item.DefaultTimeJson);
ClassTimeItem model = new ClassTimeItem()
{
DateList = new List<string>(),
TimeList = new List<TimeItem>(),
};
model.DateList = dateList;
JArray jArray = JArray.Parse(item.DefaultTimeJson);
foreach (var jItem in jArray)
{
JObject jobj = JObject.Parse(jItem.ToString());
model.TimeList.Add(new TimeItem()
{
StartTime = jobj["StartTime"].ToString(),
EndTime = jobj["EndTime"].ToString(),
});
}
List<ClassTimeItem> slist = new List<ClassTimeItem>();
slist.Add(model);
bool flag = classModule.UpdateClassTimeModule(item.ClassId, Common.Plugin.JsonHelper.Serialize(slist));
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ 83f8b8d6
......@@ -53,42 +53,48 @@ namespace Edu.WebApi.Controllers.Course
dmodel.Group_Id = userInfo.Group_Id;
var list = orderModule.GetClassPruductList(pageModel.PageIndex, pageModel.PageSize, out long count, dmodel);
pageModel.Count = Convert.ToInt32(count);
pageModel.PageData = list.Select(x => new
List<object> result = new List<object>();
foreach (var x in list)
{
x.ClassId,
x.ClassName,
x.CourseName,
x.ClassHours,
x.TeacherName,
x.TeacherHead,
x.RoomName,
x.ClassStyle,
ClassStyleName = x.ClassStyle.ToName(),
OpenTime = x.OpenTime.ToString("yyyy年MM月dd日"),
EndOrderTime = x.EndOrderTime.HasValue ? x.EndOrderTime.Value.ToString("yyyy年MM月dd日") : "",
IsCanApply = x.EndOrderTime >= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")) && x.ClassPersion > x.OrderStudentCount ? 1 : 0,
OriginalPrice=x.CourseOriginalPrice,
SellPrice=x.CourseSellPrice,
x.IsStepPrice,
x.ClassPersion,
x.OutRemark,
x.OrderStudentCount,
SurplusNum = x.ClassPersion - x.OrderStudentCount,
ClassStepPriceList = x.ClassStepPriceList.Select(z => new
var obj = new
{
z.ClassStepPriceId,
z.PersionNum,
z.PersionPrice
}),
ClassTimeList = x.DefaultTimeList,
ClassPlanList = x.ClassPlanList.Select(z => new
{
z.WeekDay,
ClassDate = x.ClassStyle == Common.Enum.Course.ClassStyleEnum.FixedDate ? z.ClassDate.ToString("yyyy-MM-dd") : ""
}),
x.SchoolName,
UpdateTime = x.UpdateTime.ToString("yyyy-MM-dd HH:mm:ss")
});
x.ClassId,
x.ClassName,
x.CourseName,
x.ClassHours,
x.TeacherName,
x.TeacherHead,
x.RoomName,
x.ClassStyle,
ClassStyleName = x.ClassStyle.ToName(),
OpenTime = x.OpenTime.ToString("yyyy年MM月dd日"),
EndOrderTime = x.EndOrderTime.HasValue ? x.EndOrderTime.Value.ToString("yyyy年MM月dd日") : "",
IsCanApply = x.EndOrderTime >= Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd")) && x.ClassPersion > x.OrderStudentCount ? 1 : 0,
OriginalPrice = x.CourseOriginalPrice,
SellPrice = x.CourseSellPrice,
x.IsStepPrice,
x.ClassPersion,
x.OutRemark,
x.OrderStudentCount,
SurplusNum = x.ClassPersion - x.OrderStudentCount,
ClassStepPriceList = x.ClassStepPriceList.Select(z => new
{
z.ClassStepPriceId,
z.PersionNum,
z.PersionPrice
}),
ClassTimeList = x.DefaultTimeList,
ClassPlanList = x.ClassPlanList.Select(z => new
{
z.WeekDay,
ClassDate = x.ClassStyle == Common.Enum.Course.ClassStyleEnum.FixedDate ? z.ClassDate.ToString("yyyy-MM-dd") : ""
}),
x.SchoolName,
UpdateTime =Common.ConvertHelper.FormatTime(x.UpdateTime)
};
result.Add(obj);
}
pageModel.PageData = result;
return ApiResult.Success("", pageModel);
}
......
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