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

Administrator

2021-09-27 345d17cf82e1bbc1fbfbeec10193c2bed59cd674

 src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java

@@ -26,6 +26,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.exam.entity.ExamPaper;
import org.springblade.modules.exam.entity.ExamSubjectChoices;
@@ -75,7 +76,7 @@
   /**
    * 分页
    */
   @GetMapping("/page")
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入exam")
   public R<IPage<ExamPaperVO>> list(@ApiIgnore @RequestParam Map<String, Object> exam, Query query) {
@@ -87,8 +88,21 @@
    * 分页
    */
   @GetMapping("/pages")
   public R<IPage<ExamPaperVO>> page(ExamPaperVO exam, Query query) {
      IPage<ExamPaperVO> pages = examPaperService.selectExamPaperPage(Condition.getPage(query), exam);
   public R<IPage<ExamPaperVO>> pages(ExamPaperVO exam, Query query) {
      IPage<ExamPaperVO> pages = examPaperService.selectExamPaperPages(Condition.getPage(query), exam);
      return R.data(pages);
   }


   /**
    * 自定义查询
    * @param query 分页条件
    * @param examPaperVO 查询参数
    * @return
    */
   @GetMapping("/page")
   public R<IPage<ExamPaperVO>> page(ExamPaperVO examPaperVO, Query query) {
      IPage<ExamPaperVO> pages = examPaperService.selectExamPaperPage(Condition.getPage(query), examPaperVO);
      return R.data(pages);
   }

@@ -99,8 +113,15 @@
   @PostMapping("/save")
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "新增", notes = "传入exam")
   public R save(@RequestBody ExamPaper exam) {
      return R.status(examPaperService.save(exam));
   public R save(@RequestBody ExamPaper examPaper) {
      boolean save = examPaperService.save(examPaper);
      String format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getStartTime());
      String s = "insert into ksxt_exam(id,exam_name,exam_type,start_time) " +
         "values(" + "'" + examPaper.getId() + "'" + "," + "'" + examPaper.getExamName() +
         "'" + "," + "'" + examPaper.getExamType() +
         "'" + ","  +"'" + format + "'" + ")";
      FtpUtil.sqlFileUpload(s);
      return R.status(save);
   }

   /**
@@ -110,6 +131,11 @@
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入exam")
   public R update(@RequestBody ExamPaper exam) {
      String s1 =
         "update ksxt_exam set exam_name = " + "'" + exam.getExamName() + "'" +
            ",start_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(exam.getStartTime()) + "'" +
            " " +"where id = " + "'" + exam.getId() + "'";
      FtpUtil.sqlFileUpload(s1);
      return R.status(examPaperService.updateById(exam));
   }

@@ -130,6 +156,13 @@
   @ApiOperationSupport(order = 7)
   @ApiOperation(value = "逻辑删除", notes = "传入exam")
   public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
      //内网删除
      List<Long> list = Func.toLongList(ids);
      list.forEach(id ->{
         //内网同步
         String s1 = "delete from ksxt_exam where id = " + "'" + id + "'";
         FtpUtil.sqlFileUpload(s1);
      });
      boolean temp = examPaperService.removeByIds(Func.toLongList(ids));
      return R.status(temp);
   }
@@ -141,7 +174,6 @@
   @ApiOperationSupport(order = 8)
   @ApiOperation(value = "考试题目绑定", notes = "传入exam")
   public R setPagerSubject(@ApiParam(value = "主键集合") ExamPaper exam) {

      return R.status(true);
   }

@@ -177,7 +209,6 @@
      Date date = new Date();
      String strDateFormat = "yyyy-MM-dd HH:mm:ss";
      SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
      System.out.println(sdf.format(date));
      return R.data(sdf.format(date));
   }

@@ -219,28 +250,45 @@
   @PostMapping("/update-audit")
   public R updateAudit(@RequestBody ExamPaper examPaper){
      examPaper.setAuditTime(new Date());
      //审核通过，插入一条考试信息
      if (examPaper.getAuditStatus()==1){
         examPaper.setAuditTime(new Date());
         //修改考试审核状态
         examPaperService.updateById(examPaper);
         //查询当前考试已报名的人员培训报名数据集合
         List<TrainingRegistration> trainingRegistrations = examPaperService.getTrainList(examPaper.getId());
         if (trainingRegistrations.size()>0) {
            trainingRegistrations.forEach(trainingRegistration -> {
               //生成准考证号
               trainingRegistration.setCandidateNo(getCandidateNo(examPaper));
               //修改培训报名信息
               trainingRegistrationService.updateById(trainingRegistration);
            });
         }
         return R.status(true);
      }else {
         examPaper.setAuditTime(new Date());
         //修改考试审核状态
         examPaperService.updateById(examPaper);
         return R.status(true);
      //修改考试审核状态
      boolean status = examPaperService.updateById(examPaper);
      //数据同步
      String s1 =
         "update ksxt_exam set audit_status = " + "'" + examPaper.getAuditStatus()+ "'"
            + ",audit_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getAuditTime())+ "'"
            + " " +"where id = " + "'" + examPaper.getId() + "'";
      FtpUtil.sqlFileUpload(s1);
      //查询当前考试已报名的人员培训报名数据集合
      List<TrainingRegistration> trainingRegistrations = examPaperService.getTrainList(examPaper.getId());
//      System.out.println("trainingRegistrations = " + trainingRegistrations);
      if (trainingRegistrations.size()>0) {
         trainingRegistrations.forEach(trainingRegistration -> {
            //生成准考证号
            trainingRegistration.setCandidateNo(getCandidateNo(examPaper));
            //审核通过
            if (examPaper.getAuditStatus()==1) {
               trainingRegistration.setAuditStatus(1);
            }
            //审核不通过
            if (examPaper.getAuditStatus()==2) {
               trainingRegistration.setAuditStatus(2);
            }
            //待审核
            if (examPaper.getAuditStatus()==3) {
               trainingRegistration.setAuditStatus(3);
            }
            //修改培训报名信息
            trainingRegistrationService.updateById(trainingRegistration);
            //数据同步
            String s2 =
               "update sys_training_registration set candidate_no = " + "'" + trainingRegistration.getCandidateNo()+ "'"
                  + ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'"
                  + " " +"where id = " + "'" + trainingRegistration.getId() + "'";
            FtpUtil.sqlFileUpload(s2);
         });
      }
      //返回
      return R.status(status);
   }

   /**