1.考试成绩查询修改 2.用户查询修改

Administrator

2021-08-17 6beeb715fcef8db22b17c309ec8fecc45cc04b00

 src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java

@@ -95,7 +95,7 @@
         if (1==user.getIsTrain()){
            return R.data(201,"已报名，不能重复报名");
         }
         if (2==user.getIsTrain()){
         if (2==user.getIsTrain()  || -1==user.getIsTrain() || 3==user.getIsTrain()){
            //已报名
            trainingRegistration.setCancel(1);
            //默认为未考试状态
@@ -133,9 +133,6 @@
            return R.data(200,"取消报名成功");
         }
      }else {
         if (user.getIsTrain()==2) {
            return R.data(201,"尚未报名");
         }
         if(user.getIsTrain()==1){
            trainingRegistration.setCancel(2);
            boolean status = trainingRegistrationService.updateById(trainingRegistration);
@@ -145,6 +142,8 @@
            if (status){
               return R.data(200,"取消报名成功");
            }
         }else {
            return R.data(201,"尚未报名");
         }

      }
@@ -168,18 +167,20 @@
            trainingRegistration1.setIsExam(1);
            trainingRegistration1.setTrainingTime(new Date());
            trainingRegistration1.setUserId(userId);
            trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
            trainingRegistrationService.save(trainingRegistration1);
            //修改保安报名状态
            user.setIsTrain(1);
            userService.updateById(user);
         }else {
            if (user.getIsTrain()==2) {
            if (user.getIsTrain()==2 || -1==user.getIsTrain() || 3==user.getIsTrain()) {
               TrainingRegistration trainingRegistration1 = new TrainingRegistration();
               trainingRegistration1.setCancel(1);
               //默认为未考试状态
               trainingRegistration1.setIsExam(1);
               trainingRegistration1.setTrainingTime(new Date());
               trainingRegistration1.setUserId(userId);
               trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
               trainingRegistrationService.save(trainingRegistration1);
               //修改保安报名状态
               user.setIsTrain(1);
@@ -405,17 +406,17 @@
    */
   @PostMapping("/batchExam")
   public R batchExam(@RequestParam String ids,
                  @RequestParam String examTime,
                  String examTime,
                  @RequestParam Date startTime,
                  @RequestParam Date endTime){
                  Date endTime){
      if (!ids.equals("")){
         List<String> list = Arrays.asList(ids.split(","));
         if (list.size()>0){
            ExamPaper examPaper = new ExamPaper();
            examPaper.setExamTime(examTime);
//            examPaper.setExamTime(examTime);
            examPaper.setExamType(2);
            examPaper.setStartTime(startTime);
            examPaper.setEndTime(endTime);
//            examPaper.setEndTime(endTime);
            Calendar instance = Calendar.getInstance();
            instance.setTime(startTime);
            int year = instance.get(Calendar.YEAR);
@@ -442,10 +443,10 @@
         if (applyIds.size()>0){
            //生成考试
            ExamPaper examPaper = new ExamPaper();
            examPaper.setExamTime(examTime);
//            examPaper.setExamTime(examTime);
            examPaper.setExamType(2);
            examPaper.setStartTime(startTime);
            examPaper.setEndTime(endTime);
//            examPaper.setEndTime(endTime);
            Calendar instance = Calendar.getInstance();
            instance.setTime(startTime);
            int year = instance.get(Calendar.YEAR);