Commit 5cbc1a71 authored by 黄奎's avatar 黄奎

页面修改

parent eb5e8241
...@@ -62,5 +62,10 @@ namespace Edu.Model.Entity.Exam ...@@ -62,5 +62,10 @@ namespace Edu.Model.Entity.Exam
/// 删除状态 /// 删除状态
/// </summary> /// </summary>
public int Status { get; set; } public int Status { get; set; }
/// <summary>
/// 组卷类型(1-智能组卷,2-手动组卷,3-智能导入)
/// </summary>
public int GenerateType { get; set; }
} }
} }
...@@ -167,7 +167,7 @@ namespace Edu.Module.Exam ...@@ -167,7 +167,7 @@ namespace Edu.Module.Exam
// 定义正则表达式用来匹配 img 标签 // 定义正则表达式用来匹配 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]*>"; 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)
{ {
extModel.GroupList = GetExaminationGroupListModule(new RB_Examination_Group_ViewModel() extModel.GroupList = GetExaminationGroupListModule(new RB_Examination_Group_ViewModel()
{ {
...@@ -177,7 +177,7 @@ namespace Edu.Module.Exam ...@@ -177,7 +177,7 @@ namespace Edu.Module.Exam
{ {
PaperId = extModel.PaperId PaperId = extModel.PaperId
}); });
if (extModel.GroupList != null && extModel.GroupList.Count > 0 && detailsList!=null && detailsList.Count>0) if (extModel.GroupList != null && extModel.GroupList.Count > 0 && detailsList != null && detailsList.Count > 0)
{ {
foreach (var gItem in extModel.GroupList) foreach (var gItem in extModel.GroupList)
{ {
...@@ -222,5 +222,16 @@ namespace Edu.Module.Exam ...@@ -222,5 +222,16 @@ namespace Edu.Module.Exam
{ {
return examination_DetailsRepository.Delete(Id) > 0; return examination_DetailsRepository.Delete(Id) > 0;
} }
/// <summary>
/// 根据分组删除分组和题目
/// </summary>
/// <param name="GId"></param>
/// <returns></returns>
public bool RemoveExamnationGroupModule(int GId)
{
return false;
}
} }
} }
...@@ -80,6 +80,7 @@ namespace Edu.WebApi.Controllers.Exam ...@@ -80,6 +80,7 @@ namespace Edu.WebApi.Controllers.Exam
CreateBy = UserInfo.Id, CreateBy = UserInfo.Id,
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
Group_Id = base.UserInfo.Group_Id, Group_Id = base.UserInfo.Group_Id,
GenerateType=base.ParmJObj.GetInt("GenerateType"),
}; };
extModel.GroupList = new List<RB_Examination_Group_ViewModel>(); extModel.GroupList = new List<RB_Examination_Group_ViewModel>();
string groups = base.ParmJObj.GetStringValue("GroupList"); string groups = base.ParmJObj.GetStringValue("GroupList");
......
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