Commit 378ec10d authored by 吴春's avatar 吴春

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

parents 8752fc1f 6a0893bf
...@@ -41,5 +41,10 @@ namespace Edu.Model.Entity.Exam ...@@ -41,5 +41,10 @@ namespace Edu.Model.Entity.Exam
/// 排序 /// 排序
/// </summary> /// </summary>
public int GSortNum { get; set; } public int GSortNum { get; set; }
/// <summary>
/// 分数
/// </summary>
public decimal GScore { get; set; }
} }
} }
...@@ -226,6 +226,7 @@ namespace Edu.Module.Exam ...@@ -226,6 +226,7 @@ namespace Edu.Module.Exam
{nameof(RB_Examination_Group_ViewModel.QuestionTypeId),gitem.QuestionTypeId }, {nameof(RB_Examination_Group_ViewModel.QuestionTypeId),gitem.QuestionTypeId },
{nameof(RB_Examination_Group_ViewModel.QuestionTypeKey),gitem.QuestionTypeKey }, {nameof(RB_Examination_Group_ViewModel.QuestionTypeKey),gitem.QuestionTypeKey },
{nameof(RB_Examination_Group_ViewModel.GSortNum),gitem.GSortNum }, {nameof(RB_Examination_Group_ViewModel.GSortNum),gitem.GSortNum },
{nameof(RB_Examination_Group_ViewModel.GScore),gitem.GScore },
}; };
flag = examination_GroupRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Group_ViewModel.GId), gitem.GId)); flag = examination_GroupRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Group_ViewModel.GId), gitem.GId));
} }
...@@ -540,7 +541,7 @@ namespace Edu.Module.Exam ...@@ -540,7 +541,7 @@ namespace Edu.Module.Exam
} }
if (flag && QuestionTypeId > 0) if (flag && QuestionTypeId > 0)
{ {
flag = examination_DetailsRepository.DeleteOne(new WhereHelper(nameof(RB_Examination_Details_ViewModel.QuestionTypeId), QuestionTypeId)); examination_DetailsRepository.DeleteOne(new WhereHelper(nameof(RB_Examination_Details_ViewModel.QuestionTypeId), QuestionTypeId));
} }
return flag; return flag;
} }
......
...@@ -107,6 +107,7 @@ namespace Edu.WebApi.Controllers.Exam ...@@ -107,6 +107,7 @@ namespace Edu.WebApi.Controllers.Exam
QuestionTypeId = jobj.GetInt("QuestionTypeId"), QuestionTypeId = jobj.GetInt("QuestionTypeId"),
QuestionTypeKey = jobj.GetStringValue("QuestionTypeKey"), QuestionTypeKey = jobj.GetStringValue("QuestionTypeKey"),
GSortNum = gSortNum, GSortNum = gSortNum,
GScore=jobj.GetDecimal("GScore"),
DetailsList = new List<RB_Examination_Details_ViewModel>(), DetailsList = new List<RB_Examination_Details_ViewModel>(),
}; };
gSortNum++; gSortNum++;
......
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