1.考试成绩查询修改 2.用户查询修改

Administrator

2021-08-17 6beeb715fcef8db22b17c309ec8fecc45cc04b00

 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;
@@ -93,7 +95,7 @@
         if (1==user.getIsTrain()){
            return R.data(201,"已报名，不能重复报名");
         }
         if (2==user.getIsTrain()){
         if (2==user.getIsTrain()  || -1==user.getIsTrain() || 3==user.getIsTrain()){
            //已报名
            trainingRegistration.setCancel(1);
            //默认为未考试状态
@@ -131,9 +133,6 @@
            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);
@@ -143,6 +142,8 @@
            if (status){
               return R.data(200,"取消报名成功");
            }
         }else {
            return R.data(201,"尚未报名");
         }

      }
@@ -166,18 +167,20 @@
            trainingRegistration1.setIsExam(1);
            trainingRegistration1.setTrainingTime(new Date());
            trainingRegistration1.setUserId(userId);
            trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
            trainingRegistrationService.save(trainingRegistration1);
            //修改保安报名状态
            user.setIsTrain(1);
            userService.updateById(user);
         }else {
            if (user.getIsTrain()==2) {
            if (user.getIsTrain()==2 || -1==user.getIsTrain() || 3==user.getIsTrain()) {
               TrainingRegistration trainingRegistration1 = new TrainingRegistration();
               trainingRegistration1.setCancel(1);
               //默认为未考试状态
               trainingRegistration1.setIsExam(1);
               trainingRegistration1.setTrainingTime(new Date());
               trainingRegistration1.setUserId(userId);
               trainingRegistration1.setTrainingUnitId(trainingRegistration.getTrainingUnitId());
               trainingRegistrationService.save(trainingRegistration1);
               //修改保安报名状态
               user.setIsTrain(1);
@@ -226,27 +229,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);
   }


@@ -391,40 +406,17 @@
    */
   @PostMapping("/batchExam")
   public R batchExam(@RequestParam String ids,
                  @RequestParam String examTime,
                  String examTime,
                  @RequestParam Date startTime,
                  @RequestParam Date endTime){
                  Date endTime){
      if (!ids.equals("")){
         List<String> list = Arrays.asList(ids.split(","));
         if (list.size()>0){
            ExamPaper examPaper = new ExamPaper();
            examPaper.setExamTime(examTime);
//            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);
         }

      }else {
         //查询已报名未关联试卷的人员
         List<Long> applyIds = trainingRegistrationService.getTrainIds();
         if (applyIds.size()>0){
            //生成考试
            ExamPaper examPaper = new ExamPaper();
            examPaper.setExamTime(examTime);
            examPaper.setExamType(2);
            examPaper.setStartTime(startTime);
            examPaper.setEndTime(endTime);
//            examPaper.setEndTime(endTime);
            Calendar instance = Calendar.getInstance();
            instance.setTime(startTime);
            int year = instance.get(Calendar.YEAR);
@@ -437,13 +429,42 @@
            //生成考试
            examPaperService.save(examPaper);
            //修改报名信息
//            applyIds.forEach(id ->{
//               Apply apply = new Apply();
//               apply.setId(id);
//               apply.setExamId(examPaper.getId());
//               apply.setCandidateNo(getCandidateNo(apply));
//               applyService.updateById(apply);
//            });
            list.forEach(id ->{
               TrainingRegistration trainingRegistration = new TrainingRegistration();
               trainingRegistration.setId(Long.parseLong(id));
               trainingRegistration.setTrainExamId(examPaper.getId().toString());
               trainingRegistrationService.updateById(trainingRegistration);
            });
         }

      }else {
         //查询已报名未关联试卷的人员
         List<Long> applyIds = trainingRegistrationService.getTrainIds();
         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);
            //修改报名信息
            applyIds.forEach(id ->{
               TrainingRegistration trainingRegistration = new TrainingRegistration();
               trainingRegistration.setId(id);
               trainingRegistration.setTrainExamId(examPaper.getId().toString());
               trainingRegistrationService.updateById(trainingRegistration);
            });
         }
      }
      return null;