src/main/java/org/springblade/modules/training/controller/TrainingRegistrationController.java
@@ -83,6 +83,8 @@
         trainingRegistration.setCancel(1);
         //默认为未考试状态
         trainingRegistration.setIsExam(1);
         //未提交考试审核
         trainingRegistration.setAuditStatus(4);
         trainingRegistration.setTrainingTime(new Date());
         //报名
         trainingRegistrationService.save(trainingRegistration);
@@ -105,6 +107,8 @@
            trainingRegistration.setCancel(1);
            //默认为未考试状态
            trainingRegistration.setIsExam(1);
            //未提交考试审核
            trainingRegistration.setAuditStatus(4);
            trainingRegistration.setTrainingTime(new Date());
            //报名
            trainingRegistrationService.save(trainingRegistration);
@@ -129,13 +133,14 @@
   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) " +
      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.getIsExam() + "'"
         + "," +"'" + trainingRegistration.getAuditStatus() + "'" + ");" +
         "update blade_user set is_train = " + user1.getIsTrain() + " " +"where id = " + "'" + user1.getId() + "'";
      FtpUtil.sqlFileUpload(s);
   }
@@ -189,11 +194,85 @@
   /**
    * 审核通过
    * @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() + " " +"where id = " + "'" + trainingRegistration.getId() + "';" +
         "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);
   }
@@ -213,6 +292,8 @@
            trainingRegistration1.setCancel(1);
            //默认为未考试状态
            trainingRegistration1.setIsExam(1);
            //未提交考试审核
            trainingRegistration.setAuditStatus(4);
            trainingRegistration1.setTrainingTime(new Date());
            trainingRegistration1.setUserId(userId);
            trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
@@ -229,6 +310,8 @@
               trainingRegistration1.setCancel(1);
               //默认为未考试状态
               trainingRegistration1.setIsExam(1);
               //未提交考试审核
               trainingRegistration.setAuditStatus(4);
               trainingRegistration1.setTrainingTime(new Date());
               trainingRegistration1.setUserId(userId);
               trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
@@ -456,32 +539,25 @@
   /**
    * 生成试卷,报名
    * @param ids 报名ids
    * @param startTime 考试开始时间
    * @param number 报名人数
    * @param endTime 截止时间
    * @param serialStart 报名序号开始
    * @param serialEnd 报名序号结束
    * @param trainingRegistrationVo 考试开始时
    */
   @PostMapping("/batchExam")
   public R batchExam(@RequestParam String ids,
                  String examTime,
                  @RequestParam Date startTime,
                  @RequestParam Integer number,
                  @RequestParam Date endTime,
                  @RequestParam Integer serialStart,
                  @RequestParam Integer serialEnd
   ){
      if (!ids.equals("")){
         List<String> list = Arrays.asList(ids.split(","));
         if (list.size()>0){
   public R batchExam(@RequestBody TrainingRegistrationVo trainingRegistrationVo){
      if (trainingRegistrationVo.getNumber()==0){
         return R.data("报名人数不能小于1人");
      }else {
         //查询已报名的人员前 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);
@@ -504,71 +580,22 @@
               ","  +"'" + examPaper.getAuditStatus() + "'" + ")";
            FtpUtil.sqlFileUpload(s);
            //修改报名信息
            list.forEach(id ->{
            applyIds.forEach(id ->{
               TrainingRegistration trainingRegistration = new TrainingRegistration();
               trainingRegistration.setId(Long.parseLong(id));
               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);
            });
         }
      }else {
         if (number==0){
            return R.data("报名人数不能小于1人");
         }else {
            //查询已报名的人员前 number 个
            //查询已报名未关联试卷的人员
            List<Long> applyIds = trainingRegistrationService.getTrainIds(number,serialStart,serialEnd);
            if (applyIds.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);
               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());
                  trainingRegistrationService.updateById(trainingRegistration);
                  String s1 =
                     "update sys_training_registration set train_exam_id = " + "'" + trainingRegistration.getTrainExamId()+ "'"
                        + " " +"where id = " + "'" + trainingRegistration.getId() + "'";
                  FtpUtil.sqlFileUpload(s1);
               });
            }
         }
      }
      return null;