Commit b5ee6362 authored by 黄奎's avatar 黄奎

页面修改

parents 7dcf1383 0d337e2c
...@@ -54,5 +54,12 @@ namespace Edu.Model.Entity.Course ...@@ -54,5 +54,12 @@ namespace Edu.Model.Entity.Course
/// 课堂随拍图片 /// 课堂随拍图片
/// </summary> /// </summary>
public string SuiPai { get; set; } public string SuiPai { get; set; }
/// <summary>
/// 课堂视频
/// </summary>
public string VideoUrl { get; set; }
} }
} }
...@@ -1555,7 +1555,7 @@ namespace Edu.Module.Course ...@@ -1555,7 +1555,7 @@ namespace Edu.Module.Course
if (FinishMinutes > 0) if (FinishMinutes > 0)
{ {
//完成课时数 //完成课时数
classHours = Convert.ToInt32((FinishMinutes + Convert.ToDecimal(nowHours)) / BasicMinutes); classHours = Convert.ToInt32((FinishMinutes + Convert.ToDecimal(nowHours)) / BasicMinutes);
} }
else else
{ {
...@@ -1572,7 +1572,8 @@ namespace Edu.Module.Course ...@@ -1572,7 +1572,8 @@ namespace Edu.Module.Course
/// <param name="SuiPai"></param> /// <param name="SuiPai"></param>
/// <param name="Id"></param> /// <param name="Id"></param>
/// <returns></returns> /// <returns></returns>
public bool UpdateTimeSuiPai(string SuiPai,int Id) { public bool UpdateTimeSuiPai(string SuiPai, int Id)
{
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
...@@ -1597,6 +1598,22 @@ namespace Edu.Module.Course ...@@ -1597,6 +1598,22 @@ namespace Edu.Module.Course
}; };
return class_TimeRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Time_ViewModel.ClassTimeId), Id)); return class_TimeRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Time_ViewModel.ClassTimeId), Id));
} }
/// <summary>
/// 更新课堂视频
/// </summary>
/// <param name="SuiPai"></param>
/// <param name="Id"></param>
/// <returns></returns>
public bool UpdateTimeClassVideo(string videoUrl, int Id)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{ nameof(RB_Class_Time_ViewModel.VideoUrl),videoUrl},
};
return class_TimeRepository.Update(fileds, new WhereHelper(nameof(RB_Class_Time_ViewModel.ClassTimeId), Id));
}
#endregion #endregion
} }
} }
...@@ -704,6 +704,10 @@ namespace Edu.WebApi.Controllers.Course ...@@ -704,6 +704,10 @@ namespace Edu.WebApi.Controllers.Course
if (signModel != null && signModel.ClassCheckId > 0) if (signModel != null && signModel.ClassCheckId > 0)
{ {
item.ClassCheckId = signModel.ClassCheckId; item.ClassCheckId = signModel.ClassCheckId;
<<<<<<< HEAD
=======
//item.StudyNum = signModel.StudyNum;
>>>>>>> 0d337e2c30a339e5ce3b2c8c34b28c7a32a2bdee
item.Group_Id = signModel.Group_Id; item.Group_Id = signModel.Group_Id;
item.CreateTime = signModel.CreateTime; item.CreateTime = signModel.CreateTime;
item.CreateBy = base.UserInfo.Id; item.CreateBy = base.UserInfo.Id;
...@@ -1251,12 +1255,36 @@ namespace Edu.WebApi.Controllers.Course ...@@ -1251,12 +1255,36 @@ namespace Edu.WebApi.Controllers.Course
{ {
return ApiResult.Failed("已下课,请勿重复操作"); return ApiResult.Failed("已下课,请勿重复操作");
} }
extModel.ClassStatus = oldModel.ClassStatus + 1; // extModel.ClassStatus = oldModel.ClassStatus + 1;
bool retult = classModule.UpdateTimeClassStatus(extModel.ClassStatus, extModel.ClassTimeId); bool retult = classModule.UpdateTimeClassStatus(extModel.ClassStatus, extModel.ClassTimeId);
return retult ? ApiResult.Success("课堂状态更新成功") : ApiResult.Failed("课堂状态更新失败"); return retult ? ApiResult.Success("课堂状态更新成功") : ApiResult.Failed("课堂状态更新失败");
} }
/// <summary>
/// 更新上课视频
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult UpdateTimeClassVideo()
{
var extModel = Common.Plugin.JsonHelper.DeserializeObject<RB_Class_Time_ViewModel>(RequestParm.Msg.ToString());
if (extModel.ClassTimeId == 0)
{
return ApiResult.Failed("请传入上课时间Id");
}
var oldModel = classModule.GetClassTimeListRepository(new RB_Class_Time_ViewModel { ClassTimeId = extModel.ClassTimeId, Group_Id = base.UserInfo.Group_Id }).FirstOrDefault();
if (oldModel == null || oldModel.ClassTimeId == 0)
{
return ApiResult.Failed("上课计划不存在");
}
if (string.IsNullOrWhiteSpace(extModel.VideoUrl))
{
return ApiResult.Failed("请传入视频地址");
}
// extModel.ClassStatus = oldModel.ClassStatus + 1;
bool retult = classModule.UpdateTimeClassVideo(extModel.VideoUrl, extModel.ClassTimeId);
return retult ? ApiResult.Success("课堂视频更新成功") : ApiResult.Failed("课堂视频更新失败");
}
#endregion #endregion
} }
} }
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