From 4f5952c0082ef451dbf2c7ac4c2fb6055cb02f38 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 18 Aug 2021 11:58:00 +0800
Subject: [PATCH] 开始考试接口调用修改

---
 src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
index 4eb7edc..8b31768 100644
--- a/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
+++ b/src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java
@@ -61,6 +61,14 @@
 	 */
 	@Override
 	public IPage<ExamScoreVO> selectExamScorePage(IPage<ExamScoreVO> page, ExamScoreVO examScore) {
+		if (null!=examScore.getExamType()){
+			if (examScore.getExamType()==1){
+				return page.setRecords(baseMapper.selectExamScorePage(page, examScore));
+			}
+			if (examScore.getExamType()==2){
+				return page.setRecords(baseMapper.selectTrainExamScorePage(page, examScore));
+			}
+		}
 		return page.setRecords(baseMapper.selectExamScorePage(page, examScore));
 	}
 
@@ -128,13 +136,18 @@
 			//获取考试信息
 			ExamPaper paper = examPaperService.getById(examScore.getPapersId());
 			int age = 0;
+			UserVO user = new UserVO();
 			//使用准考证号查询报名信息,修改考试状态为已考试
 			if(paper.getExamType()==1){
 				Apply apply = new Apply();
 				apply.setCandidateNo(examScore.getCandidateNo());
 				Apply apply1 = applyService.getOne(Condition.getQueryWrapper(apply));
 				//查询用户年龄,根据年龄计算总分
-				age = userService.getUserAgeById(apply1.getUserId()).getAge();
+				user = userService.getUserAgeById(apply1.getUserId());
+				//修改用户的考试状态,理论考试结束
+				user.setIsApply(3);
+				userService.updateById(user);
+				age = user.getAge();
 				//修改为已考试
 				apply1.setIsExam(2);
 				applyService.updateById(apply1);
@@ -145,12 +158,15 @@
 				trainingRegistration.setCandidateNo(examScore.getCandidateNo());
 				TrainingRegistration trainingRegistration1 = trainingRegistrationService.getOne(Condition.getQueryWrapper(trainingRegistration));
 				//查询用户年龄,根据年龄计算总分
-				age = userService.getUserAgeById(Long.parseLong(trainingRegistration1.getUserId())).getAge();
+				user = userService.getUserAgeById(Long.parseLong(trainingRegistration1.getUserId()));
+				//修改用户的培训状态,理论考试结束
+				user.setIsTrain(3);
+				age = user.getAge();
+				userService.updateById(user);
 				//修改为已考试
 				trainingRegistration1.setIsExam(2);
 				trainingRegistrationService.updateById(trainingRegistration1);
 			}
-
 
 			//设置考试ID
 			examScore.setExamId(examScore.getPapersId().toString());
@@ -169,8 +185,8 @@
 			}else {
 				examScore.setQualified(1);
 			}
-			//保存成绩数据
-			int i = baseMapper.insert(examScore);
+			//修改成绩数据
+			int i = baseMapper.updateById(examScore);
 			//修改考试状态
 
 			if (i>0){

--
Gitblit v1.9.3