Merge remote-tracking branch 'origin/master'

zengh

2021-08-19 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf

 src/main/java/org/springblade/modules/exam/service/impl/ExamScoreServiceImpl.java

@@ -20,7 +20,9 @@
import org.springblade.modules.exam.util.SecurityPaperUtil;
import org.springblade.modules.exam.vo.ExamResultVO;
import org.springblade.modules.exam.vo.ExamScoreVO;
import org.springblade.modules.system.entity.Role;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IRoleService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.system.vo.UserVO;
import org.springblade.modules.training.entity.TrainingRegistration;
@@ -53,6 +55,8 @@

   private final TrainingRegistrationService trainingRegistrationService;

   private final IRoleService roleService;

   /**
    * 自定义分页数据
    * @param page 分页条件
@@ -61,6 +65,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 +140,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 +162,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 +189,8 @@
         }else {
            examScore.setQualified(1);
         }
         //保存成绩数据
         int i = baseMapper.insert(examScore);
         //修改成绩数据
         int i = baseMapper.updateById(examScore);
         //修改考试状态

         if (i>0){
@@ -219,6 +239,13 @@
                           result = pre + (decimalFormat.format(count++));
                        }
                        user.setSecuritynumber(result);
                        //修改为持证保安
                        user.setHold("1");
                        //分配保安角色
                        Role role = new Role();
                        role.setRoleAlias("保安");
                        Role oneRole = roleService.getOne(Condition.getQueryWrapper(role));
                        user.setRoleId(oneRole.getId().toString());
                        //更新保安数据
                        userService.updateById(user);
                     }