报名考试接口修改

Administrator

2021-08-13 ddebcfaf85cbb400668f38b1efd82e439c6e1012

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

@@ -22,11 +22,13 @@
import org.springblade.modules.apply.vo.ApplyVO;
import org.springblade.modules.exam.entity.ExamPaper;
import org.springblade.modules.exam.entity.ExamScore;
import org.springblade.modules.exam.excel.ExamScoreExcel;
import org.springblade.modules.exam.service.ExamPaperService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.training.entity.TrainExam;
import org.springblade.modules.training.entity.TrainingRegistration;
import org.springblade.modules.training.excel.TrainingRegistrationExcel;
import org.springblade.modules.training.excel.TrainingRegistrationImporter;
import org.springblade.modules.training.service.TrainExamService;
import org.springblade.modules.training.service.TrainingRegistrationService;
@@ -226,27 +228,39 @@
      return R.data(detail);
   }

   /**
    * 导出报名数数据
    * @param response
    * @param trainingRegistration 培训报名对象
    */
   @GetMapping("export-apply")
   @ApiOperation(value = "导出报名清册")
   public void exportApply(HttpServletResponse response,TrainingRegistrationVo trainingRegistration) {
      List<ApplyInfoExcel> list = trainingRegistrationService.getTrainingRegistrationExcelList(trainingRegistration);
      ExcelUtil.export(response, "考试报名清册数据"+ DateUtil.time(), "考试报名清册数据表", list, ApplyInfoExcel.class);
   }
//   /**
//    * 导出报名数数据
//    * @param response
//    * @param trainingRegistration 培训报名对象
//    */
//   @GetMapping("export-apply")
//   @ApiOperation(value = "导出报名清册")
//   public void exportApply(HttpServletResponse response,TrainingRegistrationVo trainingRegistration) {
//      List<TrainingRegistrationExcel> list = trainingRegistrationService.getTrainingRegistrationExcelList(trainingRegistration);
//      ExcelUtil.export(response, "培训报名清册数据"+ DateUtil.time(), "培训报名清册数据表", list, TrainingRegistrationExcel.class);
//   }



   /**
    * 导入报名考试数据
    */
   @PostMapping("import-trainingRegistration")
   @ApiOperation(value = "导入报名考试数据", notes = "传入excel")
   @ApiOperation(value = "导入培训报名数据", notes = "传入excel")
   public R importUser(MultipartFile file, Integer isCovered) {
      TrainingRegistrationImporter trainingRegistrationImporter = new TrainingRegistrationImporter(trainingRegistrationService, false);
      ExcelUtil.save(file, trainingRegistrationImporter, ApplyInfoExcel.class);
      ExcelUtil.save(file, trainingRegistrationImporter, TrainingRegistrationExcel.class);
      return R.success("操作成功");
   }

   /**
    * 导出模板
    */
   @GetMapping("export-template")
   @ApiOperation(value = "导出模板")
   public void exportUser(HttpServletResponse response) {
      List<TrainingRegistrationExcel> list = new ArrayList<>();
      ExcelUtil.export(response, "培训报名数据模板", "培训报名数据表", list, TrainingRegistrationExcel.class);
   }


@@ -413,6 +427,13 @@
            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);
            });
         }

      }else {
@@ -437,13 +458,12 @@
            //生成考试
            examPaperService.save(examPaper);
            //修改报名信息
//            applyIds.forEach(id ->{
//               Apply apply = new Apply();
//               apply.setId(id);
//               apply.setExamId(examPaper.getId());
//               apply.setCandidateNo(getCandidateNo(apply));
//               applyService.updateById(apply);
//            });
            applyIds.forEach(id ->{
               TrainingRegistration trainingRegistration = new TrainingRegistration();
               trainingRegistration.setId(id);
               trainingRegistration.setTrainExamId(examPaper.getId().toString());
               trainingRegistrationService.updateById(trainingRegistration);
            });
         }
      }
      return null;