Commit 45879014 authored by 吴春's avatar 吴春

提交代码

parent 7cceffee
...@@ -461,7 +461,7 @@ WHERE 1=1 ...@@ -461,7 +461,7 @@ WHERE 1=1
new Model.Entity.Log.RB_Class_Log() new Model.Entity.Log.RB_Class_Log()
{ {
LogType = Common.Enum.Course.ClassLogTypeEnum.Class, LogType = Common.Enum.Course.ClassLogTypeEnum.Class,
LogContent = "从" + allChangePlanModel.OpenTimeStr + "开始重新排课", LogContent = "从" + allChangePlanModel.OpenTimeStr + "开始" + (Common.Plugin.EnumHelper.ToName(allChangePlanModel.ClassStyle)),
ClassId = model.ClassId, ClassId = model.ClassId,
Group_Id = model.Group_Id, Group_Id = model.Group_Id,
School_Id = model.School_Id, School_Id = model.School_Id,
......
...@@ -48,6 +48,7 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -48,6 +48,7 @@ namespace Edu.WebApi.Controllers.EduTask
ChangeType = base.ParmJObj.GetInt("ChangeType"), ChangeType = base.ParmJObj.GetInt("ChangeType"),
MoveType = base.ParmJObj.GetInt("MoveType"), MoveType = base.ParmJObj.GetInt("MoveType"),
}; };
var classModel = classModule.GetClassModule(model.ClassId);
try try
{ {
if (model.MoveType == 1) if (model.MoveType == 1)
...@@ -238,7 +239,7 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -238,7 +239,7 @@ namespace Edu.WebApi.Controllers.EduTask
{ {
return ApiResult.Failed("请输入排课信息"); return ApiResult.Failed("请输入排课信息");
} }
var classModel = classModule.GetClassModule(model.ClassId);
if (classModel != null && classModel.ClassId > 0) if (classModel != null && classModel.ClassId > 0)
{ //获取课时分钟数 { //获取课时分钟数
model.AllChangePlanModel.ClassHourMinute = classModel?.ClassHourMinute ?? 0; model.AllChangePlanModel.ClassHourMinute = classModel?.ClassHourMinute ?? 0;
...@@ -304,7 +305,7 @@ namespace Edu.WebApi.Controllers.EduTask ...@@ -304,7 +305,7 @@ namespace Edu.WebApi.Controllers.EduTask
model.CreateBy = base.UserInfo.Id; model.CreateBy = base.UserInfo.Id;
model.CreateTime = DateTime.Now; model.CreateTime = DateTime.Now;
model.Group_Id = base.UserInfo.Group_Id; model.Group_Id = base.UserInfo.Group_Id;
model.School_Id = base.UserInfo.School_Id; model.School_Id = classModel.School_Id;
} }
model.UpdateBy = base.UserInfo.Id; model.UpdateBy = base.UserInfo.Id;
model.UpdateTime = DateTime.Now; model.UpdateTime = DateTime.Now;
......
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