报名接口修改,考试计算成绩接口修改，对比答案修改为对比所有题目

Administrator

2021-08-10 c8ebf3038d2a7f69d9eb40f5a276dc3fa826fa9b

 src/main/java/org/springblade/modules/apply/controller/ApplyController.java

@@ -25,6 +25,8 @@
import org.springblade.modules.apply.vo.ApplyVO;
import org.springblade.modules.exam.entity.ExamPaper;
import org.springblade.modules.exam.service.ExamPaperService;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@@ -46,6 +48,8 @@
   private final ApplyService applyService;

   private final ExamPaperService examPaperService;

   private final IUserService userService;

   /**
    * 自定义分页
@@ -95,31 +99,62 @@
   public R submit(@RequestBody Apply apply) throws Exception {
      if (null==apply.getId()){
         //查询人员是否已报名
         Integer isApply = applyService.getIsApply(apply);
         if (null!=isApply){
            return R.data(201,"已报名，不能重复报名");
         User user = userService.getById(apply.getUserId());
         if (null==user.getIsApply()){
            //默认通过
            apply.setApplyStatus(2);
            //默认为未考试状态
            apply.setIsExam(1);
            apply.setApplyTime(new Date());
            //修改保安报名状态
            User user1 = new User();
            user1.setId(apply.getUserId());
            user1.setIsApply(1);
            userService.updateById(user1);
            return R.data(200,"报名成功");
         }else {
            if (1==user.getIsApply()){
               return R.data(201,"已报名，不能重复报名");
            }
            if (2==user.getIsApply()){
               //默认通过
               apply.setApplyStatus(2);
               //默认为未考试状态
               apply.setIsExam(1);
               apply.setApplyTime(new Date());
               //修改保安报名状态
               User user1 = new User();
               user1.setId(apply.getUserId());
               user1.setIsApply(1);
               userService.updateById(user1);
               return R.data(200,"报名成功");
            }
         }

         //去生成准考证号码
         apply.setCandidateNo(getCandidateNo(apply));
//         apply.setCandidateNo(getCandidateNo(apply));
         //去生成考试编号
         apply.setApplyCode(getApplyCode(apply));
         //默认通过
         apply.setApplyStatus(2);
         //默认为未考试状态
         apply.setIsExam(1);
         apply.setApplyTime(new Date());
//         apply.setApplyCode(getApplyCode(apply));

      }else {
         //修改保安报名状态
         User user = new User();
         user.setId(apply.getUserId());
         user.setIsApply(2);
         userService.updateById(user);
      }
      apply.setApplyStatus(4);
      boolean status = applyService.saveOrUpdate(apply);
      if (status){
         //内网新增
//         arg.test01(arg.url+"/apply/save",apply);
         return R.data(200,"报名成功");
         return R.data(200,"取消报名成功");
      }
      //内网修改
      if(null!=apply.getId()){
         //修改
         arg.test01(arg.url+"/apply/update",apply);
      }
//      //内网修改
//      if(null!=apply.getId()){
//         //修改
//         arg.test01(arg.url+"/apply/update",apply);
//      }
      return R.data(202,"报名失败");
   }

@@ -131,7 +166,7 @@
   @ApiOperation(value = "导入报名考试数据", notes = "传入excel")
   public R importUser(MultipartFile file, Integer isCovered) {
      ApplyImporter applyImporter = new ApplyImporter(applyService, false);
      ExcelUtil.save(file, applyImporter, ApplyInfoExcel.class);
      ExcelUtil.save(file, applyImporter, ApplyExcel.class);
      return R.success("操作成功");
   }

@@ -141,8 +176,8 @@
   @GetMapping("export-template")
   @ApiOperation(value = "导出模板")
   public void exportUser(HttpServletResponse response) {
      List<ApplyInfoExcel> list = new ArrayList<>();
      ExcelUtil.export(response, "考试报名数据模板", "考试报名数据表", list, ApplyInfoExcel.class);
      List<ApplyExcel> list = new ArrayList<>();
      ExcelUtil.export(response, "考试报名数据模板", "考试报名数据表", list, ApplyExcel.class);
   }


@@ -170,9 +205,9 @@
         String year = format.substring(2,4);
         String quarter  = null;
         String months = null;
         String days = null;
         int month = Integer.parseInt(format.substring(5,7));
         int day = Integer.parseInt(format.substring(8,10));
         String days = null;
         if (month>0 && month<=3){
            quarter = "C";
         }
@@ -190,17 +225,32 @@
         }
         if (day<=9){
            days = "0" + day;
         }else {
            days = ""+day;
         }
         String type = null;
         if (examPaper.getExamType()==1){
            type = "z";
         }
         if (examPaper.getExamType()==2){
            type = "m";
         }
         //获取考试名称前缀,去除数字，字母
         String examName
            = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0,1);

         //前缀 = 年的最后两位  + 月份（两位） + 考试名称（中文拼音）首字母（去除数字，字母） + 考试类型 + 季度拼音首字母大写（春季就是 C）
//         String result = year
//                     + months
//                     + toFirstChar(examName).toUpperCase()
//                     + examPaper.getExamType()
//                     + quarter;

         //前缀 = 年的最后两位  + 月份（两位） + 日 （两位） + 考试类型 正式考试  z   模拟考试   m
         String result = year
                     + months
                     + toFirstChar(examName).toUpperCase()
                     + examPaper.getExamType()
                     + quarter;
                     + days
                     + type;
         //查询是当前前缀已生成的数量
         int count = applyService.getCandidateNoCount(result);
         if (count==0){
@@ -298,7 +348,7 @@
    */
   @PostMapping("/remove")
   public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
      arg.sendPostRemoveByIds(arg.url+"/apply/remove",ids);
      //arg.sendPostRemoveByIds(arg.url+"/apply/remove",ids);
      return R.status(applyService.removeByIds(Func.toLongList(ids)));
   }

@@ -331,4 +381,161 @@
      return R.data(detail);
   }

   /**
    * 取消报名
    * @param apply 考试报名信息对象
    */
   @PostMapping("/cancelApply")
   public R cancelApply(@RequestBody Apply apply){
      //查询人员是否已报名
      User user = userService.getById(apply.getUserId());
      if(null==user.getIsApply()){
         apply.setApplyStatus(4);
         boolean status = applyService.updateById(apply);
         //修改保安报名状态
         user.setIsApply(2);
         userService.updateById(user);
         if (status){
            return R.data(200,"取消报名成功");
         }
      }else {
         if (user.getIsApply()==2) {
            return R.data(201,"尚未报名");
         }
         if(user.getIsApply()==1){
            apply.setApplyStatus(4);
            boolean status = applyService.updateById(apply);
            //修改保安报名状态
            user.setIsApply(2);
            userService.updateById(user);
            if (status){
               return R.data(200,"取消报名成功");
            }
         }

      }
      return R.data(202,"取消报名失败");
   }


   /**
    * 批量报名
    * @param apply 考试报名信息对象
    */
   @PostMapping("/batchApply")
   public R batchApply(@RequestBody ApplyVO apply){
      List<String> list = Arrays.asList(apply.getUserIds().split(","));
      list.forEach(userId ->{
         User user = userService.getById(userId);
         //未报名的新增，已报名的不做处理
         if (null==user.getIsApply()) {
            Apply apply1 = new Apply();
            apply1.setApplyStatus(2);
            //默认为未考试状态
            apply1.setIsExam(1);
            apply1.setApplyTime(new Date());
            apply1.setUserId(Long.parseLong(userId));
            applyService.save(apply1);
            //修改保安报名状态
            user.setIsApply(1);
            userService.updateById(user);
         }else {
            if (user.getIsApply()==2) {
               Apply apply1 = new Apply();
               apply1.setApplyStatus(2);
               //默认为未考试状态
               apply1.setIsExam(1);
               apply1.setApplyTime(new Date());
               apply1.setUserId(Long.parseLong(userId));
               applyService.save(apply1);
               //修改保安报名状态
               user.setIsApply(1);
               userService.updateById(user);
            }
         }
      });
      return R.data(200,"报名成功");
   }



   /**
    * 生成试卷,报名
    * @param ids 报名ids
    */
   @PostMapping("/batchExam")
   public R batchExam(@RequestParam String ids,
                  @RequestParam String examTime,
                  @RequestParam Date startTime,
                  @RequestParam Date endTime){
      if (!ids.equals("")){
         List<String> list = Arrays.asList(ids.split(","));
         if (list.size()>0){
            ExamPaper examPaper = new ExamPaper();
            examPaper.setExamTime(examTime);
            examPaper.setExamType(1);
            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);
            //生成考试
            examPaperService.save(examPaper);
            //修改报名信息
            list.forEach(id ->{
               Apply apply = new Apply();
               apply.setId(Long.parseLong(id));
               apply.setExamId(examPaper.getId());
               apply.setCandidateNo(getCandidateNo(apply));
               applyService.updateById(apply);
            });
         }

      }else {
         //查询已报名未关联试卷的人员
         List<Long> applyIds = applyService.getApplyIds();
         if (applyIds.size()>0){
            //生成考试
            ExamPaper examPaper = new ExamPaper();
            examPaper.setExamTime(examTime);
            examPaper.setExamType(1);
            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);
            //生成考试
            examPaperService.save(examPaper);
            //修改报名信息
            applyIds.forEach(id ->{
               Apply apply = new Apply();
               apply.setId(id);
               apply.setExamId(examPaper.getId());
               apply.setCandidateNo(getCandidateNo(apply));
               applyService.updateById(apply);
            });
         }
      }
      return null;
   }


   /**
    * 查询报名清册信息
    * @param apply 报名信息
    * @return
    */
   @GetMapping("/getApplyDetailList")
   public Map<String,Object> getApplyDetailList(ApplyVO apply){
      return applyService.getApplyDetailList(apply);
   }

}