Commit 8683c1c8 authored by 黄奎's avatar 黄奎

页面修改

parent 6dce3431
...@@ -70,5 +70,10 @@ namespace Edu.Model.ViewModel.Exam ...@@ -70,5 +70,10 @@ namespace Edu.Model.ViewModel.Exam
return list; return list;
} }
} }
/// <summary>
/// 学员考试表编号
/// </summary>
public int Exam_Student_Id { get; set; }
} }
} }
...@@ -1485,7 +1485,7 @@ namespace Edu.Module.Exam ...@@ -1485,7 +1485,7 @@ namespace Edu.Module.Exam
/// <param name="list">学生题目数据</param> /// <param name="list">学生题目数据</param>
/// <returns></returns> /// <returns></returns>
[TransactionCallHandler] [TransactionCallHandler]
public virtual bool SetStuExamPaperDetailsModule(int PublishId, int GuestId, int PaperId, int UserGroupId, List<RB_Examination_Details_ViewModel> list) public virtual bool SetStuExamPaperDetailsModule(int PublishId, int GuestId, int PaperId, int UserGroupId, List<RB_Examination_Details_ViewModel> list,int Exam_Student_Id)
{ {
bool flag = false; bool flag = false;
var modelPublish = GetExaminationPublishModule(PublishId); var modelPublish = GetExaminationPublishModule(PublishId);
...@@ -1538,8 +1538,15 @@ namespace Edu.Module.Exam ...@@ -1538,8 +1538,15 @@ namespace Edu.Module.Exam
{ {
new WhereHelper(nameof(RB_Examination_Student_ViewModel.PaperId),PaperId), new WhereHelper(nameof(RB_Examination_Student_ViewModel.PaperId),PaperId),
new WhereHelper(nameof(RB_Examination_Student_ViewModel.PublishId),PublishId), new WhereHelper(nameof(RB_Examination_Student_ViewModel.PublishId),PublishId),
new WhereHelper(nameof(RB_Examination_Student_ViewModel.GuestId),GuestId),
}; };
if (Exam_Student_Id > 0)
{
wheres.Add(new WhereHelper(nameof(RB_Examination_Student_ViewModel.Id), Exam_Student_Id));
}
else
{
wheres.Add(new WhereHelper(nameof(RB_Examination_Student_ViewModel.GuestId), GuestId));
}
flag = examination_StudentRepository.Update(fileds, wheres); flag = examination_StudentRepository.Update(fileds, wheres);
} }
var config = GetExaminationConfigureModel(new RB_Examination_Configure_ViewModel() var config = GetExaminationConfigureModel(new RB_Examination_Configure_ViewModel()
......
...@@ -104,9 +104,9 @@ WHERE 1=1 ...@@ -104,9 +104,9 @@ WHERE 1=1
var parameters = new DynamicParameters(); var parameters = new DynamicParameters();
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.AppendFormat(@" builder.AppendFormat(@"
SELECT A.*,IFNULL(B.PaperName,'') AS PaperName,c.ExamStatus SELECT A.*,IFNULL(B.PaperName,'') AS PaperName,c.ExamStatus,C.Id AS Exam_Student_Id
FROM RB_Examination_Publish AS A LEFT JOIN rb_examination_paper AS B ON A.PaperId=B.PaperId FROM RB_Examination_Publish AS A INNER JOIN rb_examination_paper AS B ON A.PaperId=B.PaperId
LEFT JOIN rb_examination_student as c on c.PublishId=a.Id INNER JOIN rb_examination_student as c on c.PublishId=a.Id
WHERE 1=1 and a.ExamineStatus=2 and b.ExamineStatus=2 WHERE 1=1 and a.ExamineStatus=2 and b.ExamineStatus=2
"); ");
if (query != null) if (query != null)
......
...@@ -158,6 +158,7 @@ namespace Edu.WebApi.Controllers.Applet ...@@ -158,6 +158,7 @@ namespace Edu.WebApi.Controllers.Applet
}, },
paperList = examinationPublishList.Select(x => new paperList = examinationPublishList.Select(x => new
{ {
x.Exam_Student_Id,
x.PaperId, x.PaperId,
x.Id, x.Id,
x.PaperName, x.PaperName,
...@@ -584,6 +585,7 @@ namespace Edu.WebApi.Controllers.Applet ...@@ -584,6 +585,7 @@ namespace Edu.WebApi.Controllers.Applet
var PublishId = base.ParmJObj.GetInt("PublishId"); var PublishId = base.ParmJObj.GetInt("PublishId");
var GuestId = base.ParmJObj.GetInt("GuestId", 0); var GuestId = base.ParmJObj.GetInt("GuestId", 0);
var PaperId = base.ParmJObj.GetInt("PaperId"); var PaperId = base.ParmJObj.GetInt("PaperId");
var Exam_Student_Id = base.ParmJObj.GetInt("Exam_Student_Id");
List<RB_Examination_Details_ViewModel> paperDetailsList = new List<RB_Examination_Details_ViewModel>(); List<RB_Examination_Details_ViewModel> paperDetailsList = new List<RB_Examination_Details_ViewModel>();
string groups = base.ParmJObj.GetStringValue("GroupList"); string groups = base.ParmJObj.GetStringValue("GroupList");
if (!string.IsNullOrEmpty(groups)) if (!string.IsNullOrEmpty(groups))
...@@ -638,7 +640,7 @@ namespace Edu.WebApi.Controllers.Applet ...@@ -638,7 +640,7 @@ namespace Edu.WebApi.Controllers.Applet
{ {
Group_Id = base.AppletUserInfo.Group_Id; Group_Id = base.AppletUserInfo.Group_Id;
} }
var result = paperModule.SetStuExamPaperDetailsModule(PublishId, GuestId,PaperId, Group_Id, paperDetailsList); var result = paperModule.SetStuExamPaperDetailsModule(PublishId, GuestId,PaperId, Group_Id, paperDetailsList, Exam_Student_Id);
return result ? ApiResult.Success("提交试卷成功") : ApiResult.Failed("提交试卷失败"); return result ? 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