Commit 9874320c authored by 黄奎's avatar 黄奎

页面修改

parent 53bdf870
...@@ -58,7 +58,7 @@ namespace Edu.Model.Entity.Exam ...@@ -58,7 +58,7 @@ namespace Edu.Model.Entity.Exam
/// <summary> /// <summary>
/// 题目得分 /// 题目得分
/// </summary> /// </summary>
public decimal StundetScore { get; set; } public decimal StudentScore { get; set; }
/// <summary> /// <summary>
/// 是否阅卷0-否,1-是 /// 是否阅卷0-否,1-是
......
...@@ -39,7 +39,7 @@ namespace Edu.Model.ViewModel.Exam ...@@ -39,7 +39,7 @@ namespace Edu.Model.ViewModel.Exam
/// <summary> /// <summary>
/// 学员得分 /// 学员得分
/// </summary> /// </summary>
public decimal StundetScore { get; set; } public decimal StudentScore { get; set; }
/// <summary> /// <summary>
/// 学生答案详情id(关联RB_Examination_StudentDetails表中的Id) /// 学生答案详情id(关联RB_Examination_StudentDetails表中的Id)
......
...@@ -62,6 +62,11 @@ namespace Edu.Model.ViewModel.Question ...@@ -62,6 +62,11 @@ namespace Edu.Model.ViewModel.Question
/// </summary> /// </summary>
public decimal SubScore { get; set; } public decimal SubScore { get; set; }
/// <summary>
/// 学生得分
/// </summary>
public decimal StudentScore { get; set; }
/// <summary> /// <summary>
/// 选项列表 /// 选项列表
/// </summary> /// </summary>
...@@ -125,6 +130,11 @@ namespace Edu.Model.ViewModel.Question ...@@ -125,6 +130,11 @@ namespace Edu.Model.ViewModel.Question
/// </summary> /// </summary>
public decimal SubScore { get; set; } public decimal SubScore { get; set; }
/// <summary>
/// 学生得分
/// </summary>
public decimal StudentScore { get; set; }
/// <summary> /// <summary>
/// 题目答案内容 /// 题目答案内容
/// </summary> /// </summary>
......
...@@ -1316,7 +1316,7 @@ namespace Edu.Module.Exam ...@@ -1316,7 +1316,7 @@ namespace Edu.Module.Exam
sItem.StundetAnswer, sItem.StundetAnswer,
AnswerList = isShowAnswer ? answerList : new List<object>(), AnswerList = isShowAnswer ? answerList : new List<object>(),
questionModel.AnswerParse, questionModel.AnswerParse,
sItem.StundetScore, sItem.StudentScore,
sItem.IsMarking sItem.IsMarking
}; };
questionList.Add(qObj); questionList.Add(qObj);
...@@ -1441,7 +1441,7 @@ namespace Edu.Module.Exam ...@@ -1441,7 +1441,7 @@ namespace Edu.Module.Exam
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
Status = DateStateEnum.Normal, Status = DateStateEnum.Normal,
StundetAnswer = newAnswer, StundetAnswer = newAnswer,
StundetScore = 0, StudentScore = 0,
IsMarking = 0, IsMarking = 0,
StudentContent = item.QuestionContent, StudentContent = item.QuestionContent,
StuPaperGroupId = item.StuPaperGroupId, StuPaperGroupId = item.StuPaperGroupId,
...@@ -1509,17 +1509,17 @@ namespace Edu.Module.Exam ...@@ -1509,17 +1509,17 @@ namespace Edu.Module.Exam
decimal totalScore = 0; decimal totalScore = 0;
foreach (var item in list) foreach (var item in list)
{ {
totalScore += item.StundetScore; totalScore += item.StudentScore;
RB_Examination_StudentDetails_ViewModel model = new RB_Examination_StudentDetails_ViewModel() RB_Examination_StudentDetails_ViewModel model = new RB_Examination_StudentDetails_ViewModel()
{ {
Id = item.StundetDetailsId, Id = item.StundetDetailsId,
StundetScore = item.StundetScore, StudentScore = item.StudentScore,
}; };
if (model.Id > 0) if (model.Id > 0)
{ {
Dictionary<string, object> stuFileds = new Dictionary<string, object>() Dictionary<string, object> stuFileds = new Dictionary<string, object>()
{ {
{nameof(RB_Examination_StudentDetails_ViewModel.StundetScore),model.StundetScore }, {nameof(RB_Examination_StudentDetails_ViewModel.StudentScore),model.StudentScore },
{nameof(RB_Examination_StudentDetails_ViewModel.IsMarking),1 }, {nameof(RB_Examination_StudentDetails_ViewModel.IsMarking),1 },
}; };
flag = examination_StudentDetailsRepository.Update(stuFileds, new WhereHelper(nameof(RB_Examination_StudentDetails_ViewModel.Id), model.Id)); flag = examination_StudentDetailsRepository.Update(stuFileds, new WhereHelper(nameof(RB_Examination_StudentDetails_ViewModel.Id), model.Id));
......
...@@ -48,7 +48,7 @@ namespace Edu.Module.Exam ...@@ -48,7 +48,7 @@ namespace Edu.Module.Exam
answerList.Add(new RB_Examination_StudentDetails_ViewModel() answerList.Add(new RB_Examination_StudentDetails_ViewModel()
{ {
Id = answerModel.Id, Id = answerModel.Id,
StundetScore = (sItem.Answer == answerModel.StundetAnswer) ? sItem.Score : 0 StudentScore = (sItem.Answer == answerModel.StundetAnswer) ? sItem.Score : 0
}); });
break; break;
//多选题 //多选题
...@@ -57,7 +57,7 @@ namespace Edu.Module.Exam ...@@ -57,7 +57,7 @@ namespace Edu.Module.Exam
answerList.Add(new RB_Examination_StudentDetails_ViewModel() answerList.Add(new RB_Examination_StudentDetails_ViewModel()
{ {
Id = answerModel.Id, Id = answerModel.Id,
StundetScore = (sItem.Answer == answerModel.StundetAnswer) ? sItem.Score : 0 StudentScore = (sItem.Answer == answerModel.StundetAnswer) ? sItem.Score : 0
}); });
break; break;
//填空题 //填空题
...@@ -69,7 +69,7 @@ namespace Edu.Module.Exam ...@@ -69,7 +69,7 @@ namespace Edu.Module.Exam
answerList.Add(new RB_Examination_StudentDetails_ViewModel() answerList.Add(new RB_Examination_StudentDetails_ViewModel()
{ {
Id = answerModel.Id, Id = answerModel.Id,
StundetScore = (sItem.Answer == answerModel.StundetAnswer) ? sItem.Score : 0 StudentScore = (sItem.Answer == answerModel.StundetAnswer) ? sItem.Score : 0
}); });
break; break;
//简答题 //简答题
...@@ -101,7 +101,7 @@ namespace Edu.Module.Exam ...@@ -101,7 +101,7 @@ namespace Edu.Module.Exam
answerList.Add(new RB_Examination_StudentDetails_ViewModel() answerList.Add(new RB_Examination_StudentDetails_ViewModel()
{ {
Id = answerModel.Id, Id = answerModel.Id,
StundetScore = (sItem.Answer == answerModel.StundetAnswer) ? sItem.Score : 0 StudentScore = (sItem.Answer == answerModel.StundetAnswer) ? sItem.Score : 0
}); });
break; break;
//排序题 //排序题
...@@ -109,7 +109,7 @@ namespace Edu.Module.Exam ...@@ -109,7 +109,7 @@ namespace Edu.Module.Exam
answerList.Add(new RB_Examination_StudentDetails_ViewModel() answerList.Add(new RB_Examination_StudentDetails_ViewModel()
{ {
Id = answerModel.Id, Id = answerModel.Id,
StundetScore = (sItem.Answer == answerModel.StundetAnswer) ? sItem.Score : 0 StudentScore = (sItem.Answer == answerModel.StundetAnswer) ? sItem.Score : 0
}); });
break; break;
//完型填空 //完型填空
...@@ -141,7 +141,7 @@ namespace Edu.Module.Exam ...@@ -141,7 +141,7 @@ namespace Edu.Module.Exam
answerList.Add(new RB_Examination_StudentDetails_ViewModel() answerList.Add(new RB_Examination_StudentDetails_ViewModel()
{ {
Id = answerModel.Id, Id = answerModel.Id,
StundetScore = (sItem.Answer == answerModel.StundetAnswer) ? sItem.Score : 0 StudentScore = (sItem.Answer == answerModel.StundetAnswer) ? sItem.Score : 0
}); });
break; break;
} }
...@@ -154,7 +154,7 @@ namespace Edu.Module.Exam ...@@ -154,7 +154,7 @@ namespace Edu.Module.Exam
{ {
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
{nameof(RB_Examination_StudentDetails_ViewModel.StundetScore),item.StundetScore }, {nameof(RB_Examination_StudentDetails_ViewModel.StudentScore),item.StudentScore },
{nameof(RB_Examination_StudentDetails_ViewModel.IsMarking),1 }, {nameof(RB_Examination_StudentDetails_ViewModel.IsMarking),1 },
}; };
examination_StudentDetailsRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_StudentDetails_ViewModel.Id), item.Id)); examination_StudentDetailsRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_StudentDetails_ViewModel.Id), item.Id));
......
...@@ -857,7 +857,7 @@ namespace Edu.WebApi.Controllers.Exam ...@@ -857,7 +857,7 @@ namespace Edu.WebApi.Controllers.Exam
{ {
Id = sObj.GetInt("PaperDetailsId"), Id = sObj.GetInt("PaperDetailsId"),
StundetDetailsId = sObj.GetInt("StundetDetailsId"), StundetDetailsId = sObj.GetInt("StundetDetailsId"),
StundetScore =sObj.GetDecimal("StundetScore"), StudentScore = sObj.GetDecimal("StundetScore"),
}; };
paperDetailsList.Add(detailModel); paperDetailsList.Add(detailModel);
} }
......
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