Commit b80cf891 authored by 黄奎's avatar 黄奎

新增字段

parent 5cc8b0af
...@@ -151,5 +151,10 @@ namespace Edu.Model.Entity.Course ...@@ -151,5 +151,10 @@ namespace Edu.Model.Entity.Course
/// 完成进度 /// 完成进度
/// </summary> /// </summary>
public int CompleteProgress { get; set; } public int CompleteProgress { get; set; }
/// <summary>
/// 班级类型(1-学生班,2-社会班)
/// </summary>
public int ClassType { get; set; }
} }
} }
...@@ -149,8 +149,9 @@ namespace Edu.Module.Course ...@@ -149,8 +149,9 @@ namespace Edu.Module.Course
{ nameof(RB_Class_ViewModel.ClassStyle),model.ClassStyle}, { nameof(RB_Class_ViewModel.ClassStyle),model.ClassStyle},
{ nameof(RB_Class_ViewModel.ClassStatus),model.ClassStatus}, { nameof(RB_Class_ViewModel.ClassStatus),model.ClassStatus},
{ nameof(RB_Class_ViewModel.InnerRemark),model.InnerRemark}, { nameof(RB_Class_ViewModel.InnerRemark),model.InnerRemark},
{ nameof(RB_Class_ViewModel.OutRemark),model.OutRemark}, { nameof(RB_Class_ViewModel.ClassType),model.ClassType},
//{ nameof(RB_Class_ViewModel.CompleteProgress),model.CompleteProgress}, //{ nameof(RB_Class_ViewModel.CompleteProgress),model.CompleteProgress},
//{ nameof(RB_Class_ViewModel.OutRemark),model.OutRemark},
}; };
flag = classRepository.Update(fileds, new WhereHelper(nameof(RB_Class_ViewModel.ClassId), model.ClassId)); flag = classRepository.Update(fileds, new WhereHelper(nameof(RB_Class_ViewModel.ClassId), model.ClassId));
} }
...@@ -497,11 +498,13 @@ namespace Edu.Module.Course ...@@ -497,11 +498,13 @@ namespace Edu.Module.Course
{ {
timeList = class_TimeRepository.GetClassTimeListRepository(new RB_Class_Time_ViewModel() { QClassPlanIds = Ids }); timeList = class_TimeRepository.GetClassTimeListRepository(new RB_Class_Time_ViewModel() { QClassPlanIds = Ids });
} }
DateTime today = Convert.ToDateTime(DateTime.Now.ToString("yyyy-MM-dd"));
foreach (var item in planList) foreach (var item in planList)
{ {
item.PlanTimeList = timeList?.Where(qitem => qitem.ClassPlanId == item.ClassPlanId)?.ToList(); item.PlanTimeList = timeList?.Where(qitem => qitem.ClassPlanId == item.ClassPlanId)?.ToList();
list.Add(new list.Add(new
{ {
IsEndDate = item.ClassDate <= today ? true : false,
item.ClassPlanId, item.ClassPlanId,
item.ClassId, item.ClassId,
item.ClassDate, item.ClassDate,
......
...@@ -125,6 +125,7 @@ namespace Edu.WebApi.Controllers.Course ...@@ -125,6 +125,7 @@ namespace Edu.WebApi.Controllers.Course
OutRemark = base.ParmJObj.GetStringValue("OutRemark"), OutRemark = base.ParmJObj.GetStringValue("OutRemark"),
CompleteProgress = base.ParmJObj.GetInt("CompleteProgress"), CompleteProgress = base.ParmJObj.GetInt("CompleteProgress"),
School_Id = base.ParmJObj.GetInt("School_Id"), School_Id = base.ParmJObj.GetInt("School_Id"),
ClassType=base.ParmJObj.GetInt("ClassType"),
}; };
try try
{ {
......
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