Skip to content

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

新增方法

parent 6e181ba5
Show whitespace changes
Inline Side-by-side
Showing with 178 additions and 24 deletions
Edu.Model/ViewModel/Exam/RB_Examination_Paper_ViewModel.cs
View file @ 76fef689
...@@ -21,5 +21,10 @@ namespace Edu.Model.ViewModel.Exam ...@@ -21,5 +21,10 @@ namespace Edu.Model.ViewModel.Exam
/// 问题数量 /// 问题数量
/// </summary> /// </summary>
public int QuestionCount { get; set; } public int QuestionCount { get; set; }
/// <summary>
/// 试卷编号
/// </summary>
public string QPaperIds { get; set; }
} }
} }
Edu.Module.Exam/PaperModule.cs
View file @ 76fef689
...@@ -515,14 +515,98 @@ namespace Edu.Module.Exam ...@@ -515,14 +515,98 @@ namespace Edu.Module.Exam
/// 根据分组删除分组和题目 /// 根据分组删除分组和题目
/// </summary> /// </summary>
/// <param name="GId"></param> /// <param name="GId"></param>
/// <param name="QuestionTypeId">问题类型编号</param>
/// <returns></returns> /// <returns></returns>
public bool RemoveExamnationGroupModule(int qu ,int GId) [TransactionCallHandler]
public bool RemoveExamnationGroupModule(int GId, int QuestionTypeId)
{
var flag = true;
if (GId > 0)
{
flag = examination_GroupRepository.DeleteOne(new WhereHelper(nameof(RB_Examination_Group_ViewModel.GId), GId));
}
if (flag && QuestionTypeId > 0)
{ {
IList<WhereHelper> whereHelpers = new List<WhereHelper>(); flag = examination_DetailsRepository.DeleteOne(new WhereHelper(nameof(RB_Examination_Details_ViewModel.QuestionTypeId), QuestionTypeId));
}
return flag;
}
//examination_GroupRepository.Delete() /// <summary>
return false; /// 根据试卷编号删除试卷
/// </summary>
/// <param name="PaperId"></param>
/// <returns></returns>
[TransactionCallHandler]
public bool RemoveExamnationPaperModule(int PaperId)
{
var flag = true;
if (PaperId > 0)
{
flag = examination_PaperRepository.DeleteOne(new WhereHelper(nameof(RB_Examination_Paper_ViewModel.PaperId), PaperId));
}
if (flag)
{
flag = examination_GroupRepository.DeleteOne(new WhereHelper(nameof(RB_Examination_Group_ViewModel.PaperId), PaperId));
}
if (flag)
{
flag = examination_DetailsRepository.DeleteOne(new WhereHelper(nameof(RB_Examination_Details_ViewModel.PaperId), PaperId));
}
return flag;
}
/// <summary>
/// 根据试卷编号复制试卷
/// </summary>
/// <param name="PaperId"></param>
/// <returns></returns>
[TransactionCallHandler]
public bool CopyExamnationPaperModule(int PaperId)
{
var flag = true;
var model = GetExaminationPaperModule(PaperId);
if (model == null)
{
flag = false;
return flag;
}
model.PaperId = 0;
if (model.GroupList != null && model.GroupList.Count > 0)
{
foreach (var gItem in model.GroupList)
{
gItem.GId = 0;
gItem.PaperId = 0;
if (gItem.DetailsList != null && gItem.DetailsList.Count > 0)
{
foreach (var sItem in gItem.DetailsList)
{
sItem.Id = 0;
sItem.PaperId = 0;
}
}
}
}
flag = SetExaminationPaperModule(model);
return flag;
} }
/// <summary>
/// 移动试卷
/// </summary>
/// <param name="PaperId">试卷编号</param>
/// <param name="ParentId">父节点编号</param>
/// <returns></returns>
public bool MoveExamnationPaperModule(int PaperId, int ParentId)
{
var flag = true;
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Examination_Paper_ViewModel.ParentId),ParentId}
};
flag = examination_PaperRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Paper_ViewModel.PaperId), PaperId));
return flag;
}
} }
} }
Edu.Repository/Exam/RB_Examination_PaperRepository.cs
View file @ 76fef689
...@@ -43,6 +43,18 @@ WHERE 1=1 ...@@ -43,6 +43,18 @@ WHERE 1=1
builder.AppendFormat(" AND A.{0} LIKE @PaperName ", nameof(RB_Examination_Paper_ViewModel.PaperName)); builder.AppendFormat(" AND A.{0} LIKE @PaperName ", nameof(RB_Examination_Paper_ViewModel.PaperName));
parameters.Add("PaperName", "%" + query.PaperName.Trim() + "%"); parameters.Add("PaperName", "%" + query.PaperName.Trim() + "%");
} }
if (query.ParentId > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Paper_ViewModel.ParentId), query.ParentId);
}
if (query.PaperId > 0)
{
builder.AppendFormat(@" AND A.{0}={1} ", nameof(RB_Examination_Paper_ViewModel.PaperId), query.PaperId);
}
if (!string.IsNullOrEmpty(query.QPaperIds))
{
builder.AppendFormat(@" AND A.{0} IN({1}) ", nameof(RB_Examination_Paper_ViewModel.PaperId), query.QPaperIds);
}
} }
builder.AppendFormat(" ORDER BY A.{0} DESC ", nameof(RB_Examination_Paper_ViewModel.PaperId)); 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 @ 76fef689
...@@ -41,6 +41,9 @@ namespace Edu.WebApi.Controllers.Exam ...@@ -41,6 +41,9 @@ namespace Edu.WebApi.Controllers.Exam
var query = new RB_Examination_Paper_ViewModel() var query = new RB_Examination_Paper_ViewModel()
{ {
PaperName = base.ParmJObj.GetStringValue("PaperName"), PaperName = base.ParmJObj.GetStringValue("PaperName"),
PaperId = base.ParmJObj.GetInt("PaperId"),
ParentId = base.ParmJObj.GetInt("ParentId"),
QPaperIds = base.ParmJObj.GetStringValue("QPaperIds")
}; };
query.Group_Id = base.UserInfo.Group_Id; query.Group_Id = base.UserInfo.Group_Id;
List<object> result = new List<object>(); List<object> result = new List<object>();
...@@ -78,14 +81,14 @@ namespace Edu.WebApi.Controllers.Exam ...@@ -78,14 +81,14 @@ namespace Edu.WebApi.Controllers.Exam
PaperId = base.ParmJObj.GetInt("PaperId"), PaperId = base.ParmJObj.GetInt("PaperId"),
PaperName = base.ParmJObj.GetStringValue("PaperName"), PaperName = base.ParmJObj.GetStringValue("PaperName"),
QuestionBandIds = base.ParmJObj.GetStringValue("QuestionBandIds"), QuestionBandIds = base.ParmJObj.GetStringValue("QuestionBandIds"),
DifficultyType=(DifficultyTypeEnum)base.ParmJObj.GetInt("DifficultyType"), DifficultyType = (DifficultyTypeEnum)base.ParmJObj.GetInt("DifficultyType"),
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"), GenerateType = base.ParmJObj.GetInt("GenerateType"),
CreateNum=base.ParmJObj.GetInt("CreateNum"), CreateNum = base.ParmJObj.GetInt("CreateNum"),
PaperType=base.ParmJObj.GetInt("PaperType"), PaperType = base.ParmJObj.GetInt("PaperType"),
ParentId=base.ParmJObj.GetInt("ParentId"), ParentId = base.ParmJObj.GetInt("ParentId"),
}; };
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");
...@@ -105,7 +108,7 @@ namespace Edu.WebApi.Controllers.Exam ...@@ -105,7 +108,7 @@ namespace Edu.WebApi.Controllers.Exam
GroupName = jobj.GetStringValue("GroupName"), GroupName = jobj.GetStringValue("GroupName"),
QuestionTypeId = jobj.GetInt("QuestionTypeId"), QuestionTypeId = jobj.GetInt("QuestionTypeId"),
QuestionTypeKey = jobj.GetStringValue("QuestionTypeKey"), QuestionTypeKey = jobj.GetStringValue("QuestionTypeKey"),
GSortNum= gSortNum, GSortNum = gSortNum,
DetailsList = new List<RB_Examination_Details_ViewModel>(), DetailsList = new List<RB_Examination_Details_ViewModel>(),
}; };
gSortNum++; gSortNum++;
...@@ -168,14 +171,14 @@ namespace Edu.WebApi.Controllers.Exam ...@@ -168,14 +171,14 @@ namespace Edu.WebApi.Controllers.Exam
TemplateName = base.ParmJObj.GetStringValue("TemplateName"), TemplateName = base.ParmJObj.GetStringValue("TemplateName"),
TemplateScore = base.ParmJObj.GetDecimal("TemplateScore"), TemplateScore = base.ParmJObj.GetDecimal("TemplateScore"),
TemplateNum = base.ParmJObj.GetInt("TemplateNum"), TemplateNum = base.ParmJObj.GetInt("TemplateNum"),
TemplateDifficultyType=(DifficultyTypeEnum)base.ParmJObj.GetInt("DifficultyType"), TemplateDifficultyType = (DifficultyTypeEnum)base.ParmJObj.GetInt("DifficultyType"),
TemplateBankIds=base.ParmJObj.GetStringValue("TemplateBankIds"), TemplateBankIds = base.ParmJObj.GetStringValue("TemplateBankIds"),
CreateBy = UserInfo.Id, CreateBy = UserInfo.Id,
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
Group_Id = base.UserInfo.Group_Id, Group_Id = base.UserInfo.Group_Id,
School_Id=base.UserInfo.School_Id, School_Id = base.UserInfo.School_Id,
Status= Common.Enum.DateStateEnum.Normal, Status = Common.Enum.DateStateEnum.Normal,
IsSaveTemplate=base.ParmJObj.GetBoolValue("IsSaveTemplate"), IsSaveTemplate = base.ParmJObj.GetBoolValue("IsSaveTemplate"),
}; };
string TemplateData = base.ParmJObj.GetStringValue("TemplateData"); string TemplateData = base.ParmJObj.GetStringValue("TemplateData");
if (!string.IsNullOrEmpty(TemplateData)) if (!string.IsNullOrEmpty(TemplateData))
...@@ -229,7 +232,7 @@ namespace Edu.WebApi.Controllers.Exam ...@@ -229,7 +232,7 @@ namespace Edu.WebApi.Controllers.Exam
{ {
tempStr += "、" + string.Format("{0}：{1}", tItem.DifficultyType.ToName(), tItem.ChooseNum); tempStr += "、" + string.Format("{0}：{1}", tItem.DifficultyType.ToName(), tItem.ChooseNum);
} }
QuestionStructure+= ";" + string.Format("{0}：{1}", sItem.QuestionTypeName, tempStr.TrimStart('、')); QuestionStructure += ";" + string.Format("{0}：{1}", sItem.QuestionTypeName, tempStr.TrimStart('、'));
} }
} }
} }
...@@ -241,10 +244,10 @@ namespace Edu.WebApi.Controllers.Exam ...@@ -241,10 +244,10 @@ namespace Edu.WebApi.Controllers.Exam
item.TemplateScore, item.TemplateScore,
item.TemplateNum, item.TemplateNum,
item.TemplateDifficultyType, item.TemplateDifficultyType,
TemplateDifficultyTypeName= item.TemplateDifficultyType.ToName(), TemplateDifficultyTypeName = item.TemplateDifficultyType.ToName(),
TemplateData= templist, TemplateData = templist,
item.TemplateBankIds, item.TemplateBankIds,
QuestionStructure= QuestionStructure.TrimStart(';') QuestionStructure = QuestionStructure.TrimStart(';')
}); });
} }
pageModel.Count = rowsCount; pageModel.Count = rowsCount;
...@@ -294,15 +297,65 @@ namespace Edu.WebApi.Controllers.Exam ...@@ -294,15 +297,65 @@ namespace Edu.WebApi.Controllers.Exam
/// <summary> /// <summary>
/// 根据编号删除试卷题目 /// 根据试卷详情编号删除
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DeletePaperDetails()
{
var Id = base.ParmJObj.GetInt("Id");
var flag = paperModule.RemoveExaminationDetailsModule(Id);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 根据试卷分组编号删除
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public ApiResult DeletePaperQuestion() public ApiResult DeletePaperGroup()
{
var GId = base.ParmJObj.GetInt("GId");
var QuestionTypeId = base.ParmJObj.GetInt("QuestionTypeId");
var flag = paperModule.RemoveExamnationGroupModule(GId, QuestionTypeId);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 根据试卷编号删除试卷
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult DeletePaper()
{ {
var PaperId = base.ParmJObj.GetInt("PaperId"); var PaperId = base.ParmJObj.GetInt("PaperId");
var model = paperModule.RemoveExaminationDetailsModule(PaperId); var flag = paperModule.RemoveExamnationPaperModule(PaperId);
return ApiResult.Success(data: model); return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 根据试卷编号复制试卷
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult CopyPaper()
{
var PaperId = base.ParmJObj.GetInt("PaperId");
var flag = paperModule.CopyExamnationPaperModule(PaperId);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 移动试卷或文件夹
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult MovePaper()
{
var PaperId = base.ParmJObj.GetInt("PaperId");
var ParentId = base.ParmJObj.GetInt("ParentId");
var flag = paperModule.MoveExamnationPaperModule(PaperId, ParentId);
return flag ? ApiResult.Success() : ApiResult.Failed();
} }
} }
} }
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