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

页面修改

parent c90f84ff
...@@ -326,17 +326,17 @@ ORDER BY a.OrderId DESC"; ...@@ -326,17 +326,17 @@ ORDER BY a.OrderId DESC";
if (type == 1) if (type == 1)
{ {
//复习 //复习
string sql = $@"SELECT ChapterNo FROM rb_scroll_appointment WHERE Group_Id ={groupId} and State <>5 and GuestId ={guestId} and CourseEndTime <= NOW() ORDER BY CourseEndTime DESC LIMIT 1"; string sql = $@"SELECT CourseGradeNo FROM rb_scroll_appointment WHERE Group_Id ={groupId} and State <>5 and GuestId ={guestId} and CourseEndTime <= NOW() ORDER BY CourseEndTime DESC LIMIT 1";
var robj = ExecuteScalar(sql); var robj = ExecuteScalar(sql);
return robj == null ? 0 : Convert.ToInt32(robj); return robj == null ? 0 : Convert.ToInt32(robj);
} }
else { else
{
//下一次约课 //下一次约课
string sql = $@"SELECT ChapterNo FROM rb_scroll_appointment WHERE Group_Id ={groupId} and State <>5 and GuestId ={guestId} and CourseEndTime > NOW() ORDER BY CourseEndTime ASC LIMIT 1"; string sql = $@"SELECT CourseGradeNo FROM rb_scroll_appointment WHERE Group_Id ={groupId} and State <>5 and GuestId ={guestId} and CourseEndTime > NOW() ORDER BY CourseEndTime ASC LIMIT 1";
var robj = ExecuteScalar(sql); var robj = ExecuteScalar(sql);
return robj == null ? 0 : Convert.ToInt32(robj); return robj == null ? 0 : Convert.ToInt32(robj);
} }
} }
} }
} }
...@@ -671,13 +671,20 @@ namespace Edu.WebApi.Controllers.Course ...@@ -671,13 +671,20 @@ namespace Edu.WebApi.Controllers.Course
var questionTypeList = questionModule.GetQuestionTypeListModule(new RB_Question_Type_ViewModel()); var questionTypeList = questionModule.GetQuestionTypeListModule(new RB_Question_Type_ViewModel());
foreach (var item in list) foreach (var item in list)
{ {
var model = GetQuestionModel(item, questionTypeList); try
model.CourseId = CourseId; {
model.CreateTime = DateTime.Now; var model = GetQuestionModel(item, questionTypeList);
model.CreateBy = userInfo.Id; model.CourseId = CourseId;
model.UpdateBy = userInfo.Id; model.CreateTime = DateTime.Now;
model.UpdateTime = DateTime.Now; model.CreateBy = userInfo.Id;
resultList.Add(model); model.UpdateBy = userInfo.Id;
model.UpdateTime = DateTime.Now;
resultList.Add(model);
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "ImportWordQuestion_Item:" + JsonHelper.Serialize(item));
}
} }
} }
if (isDelete) if (isDelete)
......
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