Commit 7af27cce authored by 黄奎's avatar 黄奎

页面修改

parent f15ac8eb
...@@ -97,5 +97,10 @@ namespace Edu.Model.Entity.Exam ...@@ -97,5 +97,10 @@ namespace Edu.Model.Entity.Exam
/// 是否开放(1-私有,2-公开) /// 是否开放(1-私有,2-公开)
/// </summary> /// </summary>
public int IsOpen { get; set; } public int IsOpen { get; set; }
/// <summary>
/// 审核和备注
/// </summary>
public string ExamineRemark { get; set; }
} }
} }
...@@ -1330,7 +1330,6 @@ namespace Edu.Module.EduTask ...@@ -1330,7 +1330,6 @@ namespace Edu.Module.EduTask
//退课 //退课
if (receiptModel.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.BackClass) if (receiptModel.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.BackClass)
{ {
if (auditModel.AuditStatus == 2) if (auditModel.AuditStatus == 2)
{ {
flag = student_BackClassRepository.UpdateStudentBackClassRepository(receiptModel, auditModel); flag = student_BackClassRepository.UpdateStudentBackClassRepository(receiptModel, auditModel);
...@@ -1413,10 +1412,10 @@ namespace Edu.Module.EduTask ...@@ -1413,10 +1412,10 @@ namespace Edu.Module.EduTask
{ {
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
{nameof(RB_Examination_Paper_ViewModel.ExamineStatus),(int)EduTaskRrocessStatus.Rejected} {nameof(RB_Examination_Paper_ViewModel.ExamineStatus),(int)EduTaskRrocessStatus.Rejected},
{nameof(RB_Examination_Paper_ViewModel.ExamineRemark),auditModel.Description},
}; };
flag = examination_PaperRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Paper_ViewModel.PaperId), receiptModel.RelationId)); flag = examination_PaperRepository.Update(fileds, new WhereHelper(nameof(RB_Examination_Paper_ViewModel.PaperId), receiptModel.RelationId));
} }
} }
if (receiptModel.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ExamApply) if (receiptModel.ReceiptType == Common.Enum.Finance.ReceiptTypeEnum.ExamApply)
......
...@@ -75,7 +75,6 @@ namespace Edu.Module.Exam ...@@ -75,7 +75,6 @@ namespace Edu.Module.Exam
private readonly RB_Question_PointRepository question_PointRepository = new RB_Question_PointRepository(); private readonly RB_Question_PointRepository question_PointRepository = new RB_Question_PointRepository();
/// <summary> /// <summary>
/// 获取试卷分页列表 /// 获取试卷分页列表
/// </summary> /// </summary>
...@@ -546,6 +545,11 @@ namespace Edu.Module.Exam ...@@ -546,6 +545,11 @@ namespace Edu.Module.Exam
LevelType = qItem.LevelType, LevelType = qItem.LevelType,
Score = item.QuestionScore / subTempQuestionList.Count() Score = item.QuestionScore / subTempQuestionList.Count()
}; };
string msg = analysisQuestion.CheckQuestion(detailsModel.QuestionTypeKey, detailsModel.QuestionContent, detailsModel.Answer, out string newAnswer);
if (!string.IsNullOrEmpty(newAnswer))
{
detailsModel.Answer = newAnswer;
}
Q_SortNum++; Q_SortNum++;
var newDetailsId = examination_DetailsRepository.Insert(detailsModel); var newDetailsId = examination_DetailsRepository.Insert(detailsModel);
detailsModel.Id = newDetailsId; detailsModel.Id = newDetailsId;
...@@ -845,6 +849,7 @@ namespace Edu.Module.Exam ...@@ -845,6 +849,7 @@ namespace Edu.Module.Exam
} }
} }
} }
model.ExamineRemark = "";
var configureModel = new RB_Examination_Configure_ViewModel() var configureModel = new RB_Examination_Configure_ViewModel()
{ {
Group_Id = model.Group_Id, Group_Id = model.Group_Id,
...@@ -1186,6 +1191,11 @@ namespace Edu.Module.Exam ...@@ -1186,6 +1191,11 @@ namespace Edu.Module.Exam
/// <returns></returns> /// <returns></returns>
public bool BatchSetIsOpenModule(List<int> paperIds,int IsOpen) public bool BatchSetIsOpenModule(List<int> paperIds,int IsOpen)
{ {
var list= examination_PaperRepository.GetExaminationPaperParentRepository(string.Join(",", paperIds));
foreach (var item in paperIds)
{
}
return examination_PaperRepository.BatchSetIsOpenRepository(paperIds, IsOpen)>0; return examination_PaperRepository.BatchSetIsOpenRepository(paperIds, IsOpen)>0;
} }
......
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