Commit bf4aaa18 authored by 黄奎's avatar 黄奎

新增结课日期字段

parent 0918d4aa
......@@ -166,5 +166,10 @@ namespace Edu.Model.Entity.Course
/// 默认选中的日期、周
/// </summary>
public string DateJson { get; set; }
/// <summary>
/// 结课日期
/// </summary>
public DateTime EndClassDate { get; set; }
}
}
......@@ -329,6 +329,20 @@ namespace Edu.Module.Course
return flag;
}
/// <summary>
/// 更新班级结课日期
/// </summary>
/// <param name="classId"></param>
/// <returns></returns>
public bool UpdateClassEndDateModule(int classId)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{ nameof(RB_Class_ViewModel.Status),(int)DateStateEnum.Delete},
};
return classRepository.Update(fileds, new WhereHelper(nameof(RB_Class_ViewModel.ClassId), ClassId));
}
/// <summary>
/// 生成班级上课计划表
/// </summary>
......
......@@ -117,7 +117,26 @@ WHERE 1=1
return GetPage<RB_Class_ViewModel>(pageIndex,pageSize,out rowsCount,builder.ToString(),parameters).ToList();
}
/// <summary>
/// 更新班级结课日期
/// </summary>
/// <param name="classId"></param>
/// <returns></returns>
public bool UpdateClassEndDateRepository(int classId)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
UPDATE rb_class AS A
INNER JOIN(
SELECT MAX(ClassDate) AS ClassDate,ClassId
FROM rb_class_plan WHERE `Status`=0
GROUP BY ClassId
) AS B ON A.ClassId=B.ClassId
SET A.EndClassDate=B.ClassDate
WHERE A.ClassId={0}
", classId);
return base.Execute(builder.ToString()) > 0;
}
/// <summary>
/// 获取日语培训分页列表
......
......@@ -234,6 +234,10 @@ namespace Edu.WebApi.Controllers.Course
}
bool flag = classModule.SetClassModule(extModel);
if (flag)
{
classModule.UpdateClassEndDateModule(extModel.ClassId);
}
return flag ? ApiResult.Success() : ApiResult.Failed();
}
......@@ -288,6 +292,10 @@ namespace Edu.WebApi.Controllers.Course
{
var ClassPlanId = base.ParmJObj.GetInt("ClassPlanId");
var flag = classModule.RemoveClassPlanModule(ClassPlanId, base.UserInfo);
if (flag)
{
classModule.UpdateClassEndDateModule(extModel.ClassId);
}
return flag ? ApiResult.Success() : ApiResult.Failed();
}
......@@ -344,6 +352,10 @@ namespace Edu.WebApi.Controllers.Course
}
}
var flag = classModule.SetClassPlanModule(extModel, base.UserInfo.Id);
if (flag)
{
classModule.UpdateClassEndDateModule(extModel.ClassId);
}
return flag ? ApiResult.Success() : ApiResult.Failed();
}
......
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