Commit 3dedbd30 authored by 黄奎's avatar 黄奎

页面修改

parent fc3d63a0
This diff is collapsed.
...@@ -1242,7 +1242,7 @@ namespace Edu.Module.Exam ...@@ -1242,7 +1242,7 @@ namespace Edu.Module.Exam
if (model.ExamEndTime < DateTime.Now) if (model.ExamEndTime < DateTime.Now)
{ {
fileds.Add(nameof(RB_Examination_Publish_ViewModel.ExamineStatus), (int)EduTaskRrocessStatus.Invalid); fileds.Add(nameof(RB_Examination_Publish_ViewModel.ExamineStatus), (int)EduTaskRrocessStatus.Invalid);
fileds.Add(nameof(RB_Examination_Publish_ViewModel.PublishRemark), "考试时间超过当前时间,更新为作废"); fileds.Add(nameof(RB_Examination_Publish_ViewModel.PublishRemark), "考试时间超过当前时间,更新为作废");
flag = examination_PublishRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Publish_ViewModel.Id), model.Id)); flag = examination_PublishRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Publish_ViewModel.Id), model.Id));
return flag; return flag;
} }
......
...@@ -278,6 +278,7 @@ WHERE 1=1 ...@@ -278,6 +278,7 @@ WHERE 1=1
{ {
builder.AppendFormat(" AND t.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId={0} AND `Status`=0) ", query.CreateBy); builder.AppendFormat(" AND t.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId={0} AND `Status`=0) ", query.CreateBy);
} }
//我下属的
if (query.BelongType == 4 ) if (query.BelongType == 4 )
{ {
if (query.CreateIds != null && query.CreateIds.Count > 0) if (query.CreateIds != null && query.CreateIds.Count > 0)
...@@ -285,7 +286,7 @@ WHERE 1=1 ...@@ -285,7 +286,7 @@ WHERE 1=1
string createIds = string.Join(",", query.CreateIds); string createIds = string.Join(",", query.CreateIds);
if (!string.IsNullOrEmpty(createIds)) if (!string.IsNullOrEmpty(createIds))
{ {
builder.AppendFormat(" AND t.{0} IN({1}) ", nameof(RB_Student_ViewModel.CreateBy), createIds); builder.AppendFormat(" AND (t.{0} IN({1}) OR t.StuId IN (SELECT StuId FROM rb_student_assist WHERE AssistId IN({1}) AND `Status`=0) ", nameof(RB_Student_ViewModel.CreateBy), createIds);
} }
} }
else else
......
...@@ -84,5 +84,19 @@ namespace Edu.WebApi.Controllers.Applet ...@@ -84,5 +84,19 @@ namespace Edu.WebApi.Controllers.Applet
bool flag = courseExamModule.SetStuWordsReviewModule(model); bool flag = courseExamModule.SetStuWordsReviewModule(model);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
/// <summary>
/// 生成学员单词测试
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult CreateCourseExam()
{
var CourseId = base.ParmJObj.GetInt("CourseId");
var ChapterId = base.ParmJObj.GetInt("ChapterId");
var NextChapterId = base.ParmJObj.GetInt("NextChapterId");
var obj = courseExamModule.CreateCourseExamModule(CourseId, ChapterId, NextChapterId);
return ApiResult.Success(data: obj);
}
} }
} }
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