1.培训考试报名接口修改，取消报名接口修改 2.考试成绩查询接口修改，保安个人考试查询接口修改 3.培训查询列表修改

Administrator

2021-09-06 cdb3f3546b0b3008c62a1a9d5e21dd3c0bf41b44

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

@@ -16,6 +16,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.excel.ApplyImporter;
import org.springblade.modules.apply.excel.ApplyInfoExcel;
@@ -82,6 +83,8 @@
         trainingRegistration.setCancel(1);
         //默认为未考试状态
         trainingRegistration.setIsExam(1);
         //未提交考试审核
         trainingRegistration.setAuditStatus(4);
         trainingRegistration.setTrainingTime(new Date());
         //报名
         trainingRegistrationService.save(trainingRegistration);
@@ -90,16 +93,22 @@
         user1.setId(Long.parseLong(trainingRegistration.getUserId()));
         user1.setIsTrain(1);
         userService.updateById(user1);

         //内网数据同步
         saveTrainingRegistration(trainingRegistration,user1);

         return R.data(200,"报名成功");
      }else {
         if (1==user.getIsTrain()){
            return R.data(201,"已报名，不能重复报名");
         }
         if (2==user.getIsTrain()){
         if (1!=user.getIsTrain()){
            //已报名
            trainingRegistration.setCancel(1);
            //默认为未考试状态
            trainingRegistration.setIsExam(1);
            //未提交考试审核
            trainingRegistration.setAuditStatus(4);
            trainingRegistration.setTrainingTime(new Date());
            //报名
            trainingRegistrationService.save(trainingRegistration);
@@ -108,10 +117,32 @@
            user1.setId(Long.parseLong(trainingRegistration.getUserId()));
            user1.setIsTrain(1);
            userService.updateById(user1);

            //内网数据同步
            saveTrainingRegistration(trainingRegistration,user1);

            return R.data(200,"报名成功");
         }
      }
      return R.data(202,"报名失败");
   }

   /**
    * 报名
    */
   private void saveTrainingRegistration(TrainingRegistration trainingRegistration,User user1){
      String formatStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
      Long id = trainingRegistration.getId();
      String s = "insert into sys_training_registration(id,training_unit_id,training_time,cancel,user_id,is_exam,audit_status) " +
         "values(" + "'" + id + "'"
         + "," + "'" + trainingRegistration.getTrainingUnitId() +"'"
         + "," + "'" + formatStr +"'"
         + "," + "'" + trainingRegistration.getCancel() + "'"
         + "," + "'" + trainingRegistration.getUserId() + "'"
         + "," + "'" + trainingRegistration.getIsExam() + "'"
         + "," +"'" + trainingRegistration.getAuditStatus() + "'" + ");" +
         "update blade_user set is_train = " + user1.getIsTrain() + " " +"where id = " + "'" + user1.getId() + "'";
      FtpUtil.sqlFileUpload(s);
   }


@@ -129,26 +160,121 @@
         //修改保安报名状态
         user.setIsTrain(2);
         userService.updateById(user);

         //数据同步
         cancelTrainingRegistrationSync(trainingRegistration,user);

         if (status){
            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);
            //修改保安报名状态
            user.setIsTrain(2);
            userService.updateById(user);

            //数据同步
            cancelTrainingRegistrationSync(trainingRegistration,user);

            if (status){
               return R.data(200,"取消报名成功");
            }



         }else {
            return R.data(201,"尚未报名");
         }

      }
      return R.data(202,"取消报名失败");
   }


   /**
    * 审核通过
    * @param trainingRegistration 考试报名信息对象
    */
   @PostMapping("/auditSucess")
   public R auditSucess(@RequestBody TrainingRegistration trainingRegistration){
      //查询人员信息
      User user = userService.getById(trainingRegistration.getUserId());
      boolean status = false;
      if (null!=user){
         //修改为已报名状态
         user.setIsTrain(1);
         userService.updateById(user);

         trainingRegistration.setAuditStatus(1);
         trainingRegistration.setCancel(1);
         status = trainingRegistrationService.updateById(trainingRegistration);

         //数据同步
         cancelTrainingRegistrationSync(trainingRegistration,user);
      }
      return R.data(status);
   }


   /**
    * 取消报名,并设置为审核不通过
    * @param trainingRegistration 考试报名信息对象
    */
   @PostMapping("/cancelTrainAudit")
   public R cancelApplyAudit(@RequestBody TrainingRegistration trainingRegistration){
      //查询人员是否已报名
      User user = userService.getById(trainingRegistration.getUserId());
      if(null==user.getIsTrain()){
         trainingRegistration.setCancel(2);
         trainingRegistration.setAuditStatus(2);
         boolean status = trainingRegistrationService.updateById(trainingRegistration);
         //修改保安报名状态
         user.setIsTrain(2);
         userService.updateById(user);

         //数据同步
         cancelTrainingRegistrationSync(trainingRegistration,user);

         if (status){
            return R.data(200,"取消报名成功");
         }
      }else {
         if(user.getIsTrain()==1){
            trainingRegistration.setCancel(2);
            trainingRegistration.setAuditStatus(2);
            boolean status = trainingRegistrationService.updateById(trainingRegistration);
            //修改保安报名状态
            user.setIsTrain(2);
            userService.updateById(user);

            //数据同步
            cancelTrainingRegistrationSync(trainingRegistration,user);

            if (status){
               return R.data(200,"取消报名成功");
            }

         }else {
            return R.data(201,"尚未报名");
         }

      }
      return R.data(202,"取消报名失败");
   }


   /**
    * 取消报名同步
    */
   private void cancelTrainingRegistrationSync(TrainingRegistration trainingRegistration,User user){
      String s =
         "update sys_training_registration set cancel = " + trainingRegistration.getCancel() +
            ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'" +
            " " +"where id = " + "'" + trainingRegistration.getId() + "';" +
            "update blade_user set is_train = " + user.getIsTrain() + " " +"where id = " + "'" + user.getId() + "'";
      FtpUtil.sqlFileUpload(s);
   }

   /**
@@ -166,24 +292,36 @@
            trainingRegistration1.setCancel(1);
            //默认为未考试状态
            trainingRegistration1.setIsExam(1);
            //未提交考试审核
            trainingRegistration.setAuditStatus(4);
            trainingRegistration1.setTrainingTime(new Date());
            trainingRegistration1.setUserId(userId);
            trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
            trainingRegistrationService.save(trainingRegistration1);
            //修改保安报名状态
            user.setIsTrain(1);
            userService.updateById(user);

            //数据同步
            saveTrainingRegistration(trainingRegistration1,user);
         }else {
            if (user.getIsTrain()==2) {
            if (user.getIsTrain()!=1) {
               TrainingRegistration trainingRegistration1 = new TrainingRegistration();
               trainingRegistration1.setCancel(1);
               //默认为未考试状态
               trainingRegistration1.setIsExam(1);
               //未提交考试审核
               trainingRegistration.setAuditStatus(4);
               trainingRegistration1.setTrainingTime(new Date());
               trainingRegistration1.setUserId(userId);
               trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
               trainingRegistrationService.save(trainingRegistration1);
               //修改保安报名状态
               user.setIsTrain(1);
               userService.updateById(user);

               //数据同步
               saveTrainingRegistration(trainingRegistration1,user);
            }
         }
      });
@@ -247,8 +385,8 @@
    */
   @PostMapping("import-trainingRegistration")
   @ApiOperation(value = "导入培训报名数据", notes = "传入excel")
   public R importUser(MultipartFile file, Integer isCovered) {
      TrainingRegistrationImporter trainingRegistrationImporter = new TrainingRegistrationImporter(trainingRegistrationService, false);
   public R importUser(MultipartFile file, Integer isCovered,Long examId) {
      TrainingRegistrationImporter trainingRegistrationImporter = new TrainingRegistrationImporter(trainingRegistrationService, false,examId);
      ExcelUtil.save(file, trainingRegistrationImporter, TrainingRegistrationExcel.class);
      return R.success("操作成功");
   }
@@ -401,68 +539,62 @@

   /**
    * 生成试卷,报名
    * @param ids 报名ids
    * @param trainingRegistrationVo 考试开始时
    */
   @PostMapping("/batchExam")
   public R batchExam(@RequestParam String ids,
                  @RequestParam String examTime,
                  @RequestParam Date startTime,
                  @RequestParam Date endTime){
      if (!ids.equals("")){
         List<String> list = Arrays.asList(ids.split(","));
         if (list.size()>0){
            ExamPaper examPaper = new ExamPaper();
            examPaper.setExamTime(examTime);
            examPaper.setExamType(2);
            examPaper.setStartTime(startTime);
            examPaper.setEndTime(endTime);
            Calendar instance = Calendar.getInstance();
            instance.setTime(startTime);
            int year = instance.get(Calendar.YEAR);
            int month = instance.get(Calendar.MONTH)+1;
            int day = instance.get(Calendar.DAY_OF_MONTH);
            String examName = year + "年" + month+ "月"+ day +"日" +"保安员证模拟考试";
            examPaper.setExamName(examName);
            //待审核
            examPaper.setAuditStatus(3);
            //生成考试
            examPaperService.save(examPaper);
            //修改报名信息
            list.forEach(id ->{
               TrainingRegistration trainingRegistration = new TrainingRegistration();
               trainingRegistration.setId(Long.parseLong(id));
               trainingRegistration.setTrainExamId(examPaper.getId().toString());
               trainingRegistrationService.updateById(trainingRegistration);
            });
         }

   public R batchExam(@RequestBody TrainingRegistrationVo trainingRegistrationVo){
      if (trainingRegistrationVo.getNumber()==0){
         return R.data("报名人数不能小于1人");
      }else {
         //查询已报名未关联试卷的人员
         List<Long> applyIds = trainingRegistrationService.getTrainIds();
         //查询已报名的人员前 number 个
         //查询已报名未关联试卷的人员,同步报名列表
         List<Long> applyIds = trainingRegistrationService.getTrainIds(trainingRegistrationVo);
         System.out.println("applyIds = " + applyIds);
         if (applyIds.size()>0){
            //生成考试
            ExamPaper examPaper = new ExamPaper();
            examPaper.setExamTime(examTime);
            examPaper.setExamType(2);
            examPaper.setStartTime(startTime);
            examPaper.setEndTime(endTime);
            examPaper.setStartTime(trainingRegistrationVo.getStartTime());
            examPaper.setEndTime(trainingRegistrationVo.getEndTime());
            Calendar instance = Calendar.getInstance();
            instance.setTime(startTime);
            instance.setTime(trainingRegistrationVo.getStartTime());
            int year = instance.get(Calendar.YEAR);
            int month = instance.get(Calendar.MONTH)+1;
            int day = instance.get(Calendar.DAY_OF_MONTH);
            String examName = year + "年" + month+ "月"+ day +"日" +"保安员证模拟考试";
            String examName = year + "年" + month+ "月"+ day +"日" +"保安员证培训考试";
            examPaper.setExamName(examName);
            //待审核
            examPaper.setAuditStatus(3);
            //生成考试
            examPaperService.save(examPaper);

            Long sid = examPaper.getId();
            String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
            String endTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getEndTime());
            String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,end_time,audit_status) " +
               "values(" + "'" + sid + "'" +
               "," + "'" + examPaper.getExamName() + "'" +
               "," + "'" + examPaper.getExamType() +"'" +
               "," + "'" + format +"'" +
               "," + "'" + endTimeFormat +"'" +
               ","  +"'" + examPaper.getAuditStatus() + "'" + ")";
            FtpUtil.sqlFileUpload(s);


            //修改报名信息
            applyIds.forEach(id ->{
               TrainingRegistration trainingRegistration = new TrainingRegistration();
               trainingRegistration.setId(id);
               trainingRegistration.setTrainExamId(examPaper.getId().toString());
               //提交考试审核
               trainingRegistration.setAuditStatus(3);
               trainingRegistrationService.updateById(trainingRegistration);

               String s1 =
                  "update sys_training_registration set train_exam_id = " + "'" + trainingRegistration.getTrainExamId()+ "'"
                     +",audit_status = " + "'" + trainingRegistration.getAuditStatus()+ "'"
                     + " " +"where id = " + "'" + trainingRegistration.getId() + "'";
               FtpUtil.sqlFileUpload(s1);
            });
         }
      }