注册登录，车辆，装备，枪支，招聘，培训考试修改

Administrator

2021-09-27 345d17cf82e1bbc1fbfbeec10193c2bed59cd674

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

@@ -293,7 +293,7 @@
            //默认为未考试状态
            trainingRegistration1.setIsExam(1);
            //未提交考试审核
            trainingRegistration.setAuditStatus(4);
            trainingRegistration1.setAuditStatus(4);
            trainingRegistration1.setTrainingTime(new Date());
            trainingRegistration1.setUserId(userId);
            trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
@@ -311,7 +311,7 @@
               //默认为未考试状态
               trainingRegistration1.setIsExam(1);
               //未提交考试审核
               trainingRegistration.setAuditStatus(4);
               trainingRegistration1.setAuditStatus(4);
               trainingRegistration1.setTrainingTime(new Date());
               trainingRegistration1.setUserId(userId);
               trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
@@ -538,7 +538,7 @@


   /**
    * 生成试卷,报名
    * 生成试卷,报名，考试申请
    * @param trainingRegistrationVo 考试开始时
    */
   @PostMapping("/batchExam")
@@ -564,25 +564,29 @@
            examPaper.setExamName(examName);
            //待审核
            examPaper.setAuditStatus(3);
            //创建时间
            examPaper.setCreatorDate(new Date());
            //生成考试
            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) " +
            String creatorTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getCreatorDate());
            String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time,end_time,creator_date,audit_status) " +
               "values(" + "'" + sid + "'" +
               "," + "'" + examPaper.getExamName() + "'" +
               "," + "'" + examPaper.getExamType() +"'" +
               "," + "'" + format +"'" +
               "," + "'" + endTimeFormat +"'" +
               "," + "'" + creatorTimeFormat +"'" +
               ","  +"'" + examPaper.getAuditStatus() + "'" + ")";
            FtpUtil.sqlFileUpload(s);


            //修改报名信息
            applyIds.forEach(trainingRegistration ->{
               if(null==trainingRegistration.getTrainExamId() && trainingRegistration.getTrainExamId()=="") {
               if(null==trainingRegistration.getTrainExamId() || trainingRegistration.getTrainExamId()=="") {
                  trainingRegistration.setTrainExamId(examPaper.getId().toString());
                  //提交考试审核
                  trainingRegistration.setAuditStatus(3);