Skip to content

E
Education
Commit f62bd774 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent c00dd070
Hide whitespace changes
Inline Side-by-side
Showing with 100 additions and 43 deletions
Edu.Module.Exam/PaperModule.cs
View file @ f62bd774
...@@ -60,7 +60,7 @@ namespace Edu.Module.Exam ...@@ -60,7 +60,7 @@ namespace Edu.Module.Exam
public List<ExaminationPaperTreeModel> GetExaminationPaperPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Examination_Paper_ViewModel query) public List<ExaminationPaperTreeModel> GetExaminationPaperPageModule(int pageIndex, int pageSize, out long rowsCount, RB_Examination_Paper_ViewModel query)
{ {
List<ExaminationPaperTreeModel> treeList = new List<ExaminationPaperTreeModel>(); List<ExaminationPaperTreeModel> treeList = new List<ExaminationPaperTreeModel>();
var data= examination_PaperRepository.GetExaminationPaperPageRepository(pageIndex, pageSize, out rowsCount, query); var data = examination_PaperRepository.GetExaminationPaperPageRepository(pageIndex, pageSize, out rowsCount, query);
if (data != null && data.Count > 0) if (data != null && data.Count > 0)
{ {
var childList = new List<RB_Examination_Paper_ViewModel>(); var childList = new List<RB_Examination_Paper_ViewModel>();
...@@ -86,7 +86,7 @@ namespace Edu.Module.Exam ...@@ -86,7 +86,7 @@ namespace Edu.Module.Exam
var detailsList = new List<RB_Examination_Details_ViewModel>(); var detailsList = new List<RB_Examination_Details_ViewModel>();
if (qIdList != null && qIdList.Count > 0) if (qIdList != null && qIdList.Count > 0)
{ {
detailsList= examination_DetailsRepository.GetExaminationDetailsStaticListRepository(new RB_Examination_Details_ViewModel() detailsList = examination_DetailsRepository.GetExaminationDetailsStaticListRepository(new RB_Examination_Details_ViewModel()
{ {
QPaperIds = string.Join(",", qIdList) QPaperIds = string.Join(",", qIdList)
}); });
...@@ -100,13 +100,13 @@ namespace Edu.Module.Exam ...@@ -100,13 +100,13 @@ namespace Edu.Module.Exam
QuestionBandIds = item.QuestionBandIds, QuestionBandIds = item.QuestionBandIds,
DifficultyTypeName = item.DifficultyType.ToName(), DifficultyTypeName = item.DifficultyType.ToName(),
CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime), CreateTimeStr = Common.ConvertHelper.FormatTime(item.CreateTime),
CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName??"", CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "",
PublishCount = item.PublishCount, PublishCount = item.PublishCount,
GenerateType = item.GenerateType, GenerateType = item.GenerateType,
CreateNum = item.CreateNum, CreateNum = item.CreateNum,
PaperType = item.PaperType, PaperType = item.PaperType,
ParentId = item.ParentId, ParentId = item.ParentId,
QuestionCount=detailsList?.Where(qitem=>qitem.PaperId==item.PaperId)?.Count()??0, QuestionCount = detailsList?.Where(qitem => qitem.PaperId == item.PaperId)?.FirstOrDefault()?.QuestionCount ?? 0,
ChildList = new List<ExaminationPaperTreeModel>(), ChildList = new List<ExaminationPaperTreeModel>(),
}; };
model.ChildList = GetPaperChild(childList, detailsList, item.PaperId); model.ChildList = GetPaperChild(childList, detailsList, item.PaperId);
...@@ -122,7 +122,7 @@ namespace Edu.Module.Exam ...@@ -122,7 +122,7 @@ namespace Edu.Module.Exam
/// <param name="sourceList">源数据</param> /// <param name="sourceList">源数据</param>
/// <param name="parentId">父节点编号</param> /// <param name="parentId">父节点编号</param>
/// <returns></returns> /// <returns></returns>
public List<ExaminationPaperTreeModel> GetPaperChild(List<RB_Examination_Paper_ViewModel> sourceList, List<RB_Examination_Details_ViewModel> detailsList, int parentId) public List<ExaminationPaperTreeModel> GetPaperChild(List<RB_Examination_Paper_ViewModel> sourceList, List<RB_Examination_Details_ViewModel> detailsList, int parentId)
{ {
List<ExaminationPaperTreeModel> resultList = new List<ExaminationPaperTreeModel>(); List<ExaminationPaperTreeModel> resultList = new List<ExaminationPaperTreeModel>();
//获取下级节点 //获取下级节点
...@@ -145,7 +145,7 @@ namespace Edu.Module.Exam ...@@ -145,7 +145,7 @@ namespace Edu.Module.Exam
CreateNum = childItem.CreateNum, CreateNum = childItem.CreateNum,
PaperType = childItem.PaperType, PaperType = childItem.PaperType,
ParentId = childItem.ParentId, ParentId = childItem.ParentId,
QuestionCount = detailsList?.Where(qitem => qitem.PaperId == childItem.PaperId)?.Count() ?? 0, QuestionCount = detailsList?.Where(qitem => qitem.PaperId == childItem.PaperId)?.FirstOrDefault()?.QuestionCount ?? 0,
ChildList = new List<ExaminationPaperTreeModel>(), ChildList = new List<ExaminationPaperTreeModel>(),
}; };
childModel.ChildList.AddRange(GetPaperChild(sourceList, detailsList, childItem.PaperId)); childModel.ChildList.AddRange(GetPaperChild(sourceList, detailsList, childItem.PaperId));
...@@ -175,6 +175,19 @@ namespace Edu.Module.Exam ...@@ -175,6 +175,19 @@ namespace Edu.Module.Exam
return examination_DetailsRepository.GetExaminationDetailsListRepository(query); return examination_DetailsRepository.GetExaminationDetailsListRepository(query);
} }
/// <summary>
/// 获取试卷模板分页列表
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <param name="rowsCount"></param>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_Examination_Template_ViewModel> GetExaminationTemplatePageModule(int pageIndex, int pageSize, out long rowsCount, RB_Examination_Template_ViewModel query)
{
return examination_TemplateRepository.GetExaminationTemplatePageRepository(pageIndex, pageSize, out rowsCount, query);
}
/// <summary> /// <summary>
/// 新增/修改试卷 /// 新增/修改试卷
/// </summary> /// </summary>
...@@ -278,7 +291,7 @@ namespace Edu.Module.Exam ...@@ -278,7 +291,7 @@ namespace Edu.Module.Exam
} }
else else
{ {
var newTempId= examination_TemplateRepository.Insert(model); var newTempId = examination_TemplateRepository.Insert(model);
model.TemplateId = newTempId; model.TemplateId = newTempId;
flag = newTempId > 0; flag = newTempId > 0;
} }
...@@ -287,23 +300,23 @@ namespace Edu.Module.Exam ...@@ -287,23 +300,23 @@ namespace Edu.Module.Exam
var questionList = questionRepository.GetQuestionListRepository(new RB_Question_ViewModel() var questionList = questionRepository.GetQuestionListRepository(new RB_Question_ViewModel()
{ {
QBankIds = model.TemplateBankIds QBankIds = model.TemplateBankIds
}); });
//文件夹 //文件夹
var paperModel = new RB_Examination_Paper_ViewModel() var paperModel = new RB_Examination_Paper_ViewModel()
{ {
PaperId=0, PaperId = 0,
PaperName=model.TemplateName, PaperName = model.TemplateName,
QuestionBandIds=model.TemplateBankIds, QuestionBandIds = model.TemplateBankIds,
DifficultyType=model.TemplateDifficultyType, DifficultyType = model.TemplateDifficultyType,
CreateTime=model.CreateTime, CreateTime = model.CreateTime,
CreateBy=model.CreateBy, CreateBy = model.CreateBy,
PublishCount=0, PublishCount = 0,
Group_Id=model.Group_Id, Group_Id = model.Group_Id,
School_Id=model.School_Id, School_Id = model.School_Id,
GenerateType=1, GenerateType = 1,
CreateNum=model.TemplateNum, CreateNum = model.TemplateNum,
PaperType=1, PaperType = 1,
ParentId=0, ParentId = 0,
}; };
var newPaperId = examination_PaperRepository.Insert(paperModel); var newPaperId = examination_PaperRepository.Insert(paperModel);
paperModel.PaperId = newPaperId; paperModel.PaperId = newPaperId;
...@@ -315,7 +328,7 @@ namespace Edu.Module.Exam ...@@ -315,7 +328,7 @@ namespace Edu.Module.Exam
var subModel = new RB_Examination_Paper_ViewModel() var subModel = new RB_Examination_Paper_ViewModel()
{ {
PaperId = 0, PaperId = 0,
PaperName = model.TemplateName+(i+1), PaperName = model.TemplateName + (i + 1),
QuestionBandIds = model.TemplateBankIds, QuestionBandIds = model.TemplateBankIds,
DifficultyType = model.TemplateDifficultyType, DifficultyType = model.TemplateDifficultyType,
CreateTime = model.CreateTime, CreateTime = model.CreateTime,
...@@ -457,8 +470,6 @@ namespace Edu.Module.Exam ...@@ -457,8 +470,6 @@ namespace Edu.Module.Exam
/// <returns></returns> /// <returns></returns>
public RB_Examination_Paper_ViewModel GetExaminationPaperModule(object PaperId) public RB_Examination_Paper_ViewModel GetExaminationPaperModule(object PaperId)
{ {
// 定义正则表达式用来匹配 img 标签
string str = @"<img\b[^<>]*?\bsrc[\s\t\r\n]*=[\s\t\r\n]*[""']?[\s\t\r\n]*(?<imgUrl>[^\s\t\r\n""'<>]*)[^<>]*?/?[\s\t\r\n]*>";
var extModel = examination_PaperRepository.GetEntity<RB_Examination_Paper_ViewModel>(PaperId); var extModel = examination_PaperRepository.GetEntity<RB_Examination_Paper_ViewModel>(PaperId);
if (extModel != null && extModel.PaperId > 0) if (extModel != null && extModel.PaperId > 0)
{ {
...@@ -480,25 +491,7 @@ namespace Edu.Module.Exam ...@@ -480,25 +491,7 @@ namespace Edu.Module.Exam
foreach (var sItem in gItem.DetailsList) foreach (var sItem in gItem.DetailsList)
{ {
sItem.QuestionContentObj = analysisQuestion.ParsingQuestion(sItem.QuestionTypeKey, sItem.QuestionContent); sItem.QuestionContentObj = analysisQuestion.ParsingQuestion(sItem.QuestionTypeKey, sItem.QuestionContent);
string newTitle = sItem.Title; sItem.ShowTitle = Common.Plugin.StringHelper.FilterHtml(sItem.Title);
try
{
newTitle = Regex.Replace(newTitle, str, "[图片]");
}
catch
{
newTitle = sItem.Title;
}
try
{
newTitle = Regex.Replace(newTitle, @"<iframe\s*[^>]*>", "[音频", RegexOptions.IgnoreCase);
newTitle = Regex.Replace(newTitle, @"</iframe>", "]", RegexOptions.IgnoreCase);
}
catch
{
newTitle = sItem.Title;
}
sItem.ShowTitle = Common.Plugin.StringHelper.FilterHtml(newTitle);
} }
} }
} }
......
Edu.Repository/Exam/RB_Examination_PaperRepository.cs
View file @ f62bd774
...@@ -44,6 +44,7 @@ WHERE 1=1 ...@@ -44,6 +44,7 @@ WHERE 1=1
parameters.Add("PaperName", "%" + query.PaperName.Trim() + "%"); parameters.Add("PaperName", "%" + query.PaperName.Trim() + "%");
} }
} }
builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Examination_Paper_ViewModel.PaperId));
return GetPage<RB_Examination_Paper_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList(); return GetPage<RB_Examination_Paper_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
} }
......
Edu.WebApi/Controllers/Exam/ExamController.cs
View file @ f62bd774
...@@ -191,6 +191,69 @@ namespace Edu.WebApi.Controllers.Exam ...@@ -191,6 +191,69 @@ namespace Edu.WebApi.Controllers.Exam
return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed(); return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed();
} }
/// <summary>
/// 获取试卷组卷模板
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetExaminationTemplatePage()
{
var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
var query = new RB_Examination_Template_ViewModel()
{
TemplateName = base.ParmJObj.GetStringValue("TemplateName"),
CreateBy = base.UserInfo.Id,
};
query.Group_Id = base.UserInfo.Group_Id;
List<object> result = new List<object>();
var list = paperModule.GetExaminationTemplatePageModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
foreach (var item in list)
{
var templist = new List<ExamTemplate>();
string QuestionStructure = "";
if (!string.IsNullOrEmpty(item.TemplateData))
{
templist = Common.Plugin.JsonHelper.DeserializeObject<List<ExamTemplate>>(item.TemplateData);
if (templist != null && templist.Count > 0)
{
foreach (var sItem in templist)
{
if (sItem.ChooseType == 1)
{
QuestionStructure += ";" + string.Format("{0}：{1}", sItem.QuestionTypeName, sItem.ChooseNum);
}
else if (sItem.ChooseType == 2)
{
string tempStr = "";
foreach (var tItem in sItem.ChooseList)
{
tempStr += "、" + string.Format("{0}：{1}", tItem.DifficultyType.ToName(), tItem.ChooseNum);
}
QuestionStructure+= ";" + string.Format("{0}：{1}", sItem.QuestionTypeName, tempStr.TrimStart('、'));
}
}
}
}
result.Add(new
{
item.TemplateId,
item.TemplateName,
item.TemplateScore,
item.TemplateNum,
item.TemplateDifficultyType,
TemplateDifficultyTypeName= item.TemplateDifficultyType.ToName(),
TemplateData= templist,
item.TemplateBankIds,
QuestionStructure= QuestionStructure.TrimStart(';')
});
}
pageModel.Count = rowsCount;
pageModel.PageData = result;
return ApiResult.Success(data: pageModel);
}
/// <summary> /// <summary>
/// 新增修改文件夹 /// 新增修改文件夹
/// </summary> /// </summary>
......
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