Skip to content

E
Education
Commit a6df4f52 authored by liudong1993's avatar liudong1993
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/education

parents daabd064 bf4b8147
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 20 deletions
Edu.Module.Exam/CourseExamModule.cs
View file @ a6df4f52
...@@ -40,36 +40,119 @@ namespace Edu.Module.Exam ...@@ -40,36 +40,119 @@ namespace Edu.Module.Exam
List<object> reviewGroupList = new List<object>(); List<object> reviewGroupList = new List<object>();
List<object> prepGroupList = new List<object>(); List<object> prepGroupList = new List<object>();
if (reviewList != null && reviewList.Count > 0) if (reviewList != null && reviewList.Count > 0)
{ {
for (var i = 0; i < reviewList.Count; i++) for (var i = 0; i < reviewList.Count; i++)
{ {
var tempWords = reviewList[i];
//选择题 //选择题
if (i % 2 == 0) if (i % 2 == 0)
{ {
string title = "我是问题"; string title = "我是问题";
string wordType = tempWords.WordType;
string wordTone = tempWords.WordTone;
List<optionItem> options = new List<optionItem>();
int randNum = Common.ConvertHelper.CreateRandomNum(); int randNum = Common.ConvertHelper.CreateRandomNum();
switch (randNum) var tempList = reviewList.Where(qitem => qitem.Id != tempWords.Id)?.Take(3)?.ToList();
if (tempList != null && tempList.Count > 2)
{ {
//根据单词选择中文意思 switch (randNum)
case 0: {
//根据单词选择中文意思
break; case 0:
//根据中文意思选择单词 title = tempWords.WordContent;
case 1: options.Add(new optionItem()
{
break; Content = tempWords.ChineseMean,
//根据日语书写选择中文意思 IsAnswer = true,
case 2: Name = "",
ShowName = ""
});
foreach (var item in tempList)
{
options.Add(new optionItem()
{
Content = item.ChineseMean,
IsAnswer = false,
Name = "",
ShowName = "",
});
}
break;
//根据中文意思选择单词
case 1:
title = tempWords.ChineseMean;
options.Add(new optionItem()
{
Content = tempWords.WordContent,
IsAnswer = true,
Name = "",
ShowName = ""
});
foreach (var item in tempList)
{
options.Add(new optionItem()
{
Content = item.WordContent,
IsAnswer = false,
Name = "",
ShowName = "",
});
}
break;
//根据日语书写选择中文意思
case 2:
title = tempWords.WordWrite;
options.Add(new optionItem()
{
Content = tempWords.ChineseMean,
IsAnswer = true,
Name = "",
ShowName = ""
});
foreach (var item in tempList)
{
options.Add(new optionItem()
{
Content = item.ChineseMean,
IsAnswer = false,
Name = "",
ShowName = "",
});
}
break;
//根据中文意思选日语书写
case 3:
title = tempWords.ChineseMean;
options.Add(new optionItem()
{
Content = tempWords.WordWrite,
IsAnswer = true,
Name = "",
ShowName = ""
});
foreach (var item in tempList)
{
options.Add(new optionItem()
{
Content = item.WordWrite,
IsAnswer = false,
Name = "",
ShowName = "",
});
}
break;
}
break; options= options?.OrderBy(qitem => Guid.NewGuid())?.ToList();
//根据中文意思选日语书写 for (var j = 1; j <= options.Count; j++)
case 3: {
options[j].Name = Common.Plugin.StringHelper.ReturnEnChar(j);
break; options[j].ShowName = Common.Plugin.StringHelper.ReturnEnChar(j);
}
} }
List<optionItem> options = new List<optionItem>();
reviewGroupList.Add(new reviewGroupList.Add(new
{ {
QuestionTypeName = "单选题", QuestionTypeName = "单选题",
......
Edu.WebApi/Controllers/Applet/AppletLoginController.cs
View file @ a6df4f52
...@@ -155,7 +155,7 @@ namespace Edu.WebApi.Controllers.APP ...@@ -155,7 +155,7 @@ namespace Edu.WebApi.Controllers.APP
//{ //{
// return ApiResult.Failed(message: "用户不存在", new { Error = -1 }); // return ApiResult.Failed(message: "用户不存在", new { Error = -1 });
//} //}
IUserInfoToken mallUserInfo = new ErpTokenUserInfo { uid = umodel.Id.ToString(), requestFrom = Common.Enum.ApiRequestFromEnum.MallMiniProgram }; IUserInfoToken mallUserInfo = new ErpTokenUserInfo { uid = (umodel?.Id??0).ToString(), requestFrom = Common.Enum.ApiRequestFromEnum.MallMiniProgram };
#region JWT #region JWT
IDateTimeProvider provider = new UtcDateTimeProvider(); IDateTimeProvider provider = new UtcDateTimeProvider();
var now = provider.GetNow().AddMinutes(-1); var now = provider.GetNow().AddMinutes(-1);
...@@ -343,7 +343,7 @@ namespace Edu.WebApi.Controllers.APP ...@@ -343,7 +343,7 @@ namespace Edu.WebApi.Controllers.APP
//{ //{
// return ApiResult.Failed(message: "用户不存在", new { Error = -1 }); // return ApiResult.Failed(message: "用户不存在", new { Error = -1 });
//} //}
IUserInfoToken mallUserInfo = new ErpTokenUserInfo { uid = umodel.Id.ToString(), requestFrom = Common.Enum.ApiRequestFromEnum.MallMiniProgram }; IUserInfoToken mallUserInfo = new ErpTokenUserInfo { uid = (umodel?.Id??0).ToString(), requestFrom = Common.Enum.ApiRequestFromEnum.MallMiniProgram };
#region JWT #region JWT
IDateTimeProvider provider = new UtcDateTimeProvider(); IDateTimeProvider provider = new UtcDateTimeProvider();
var now = provider.GetNow().AddMinutes(-1); var now = provider.GetNow().AddMinutes(-1);
......
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