1.考试报名新增判断，同一人，同一场考试，已报名且未考试，审核通过和待审核的不能再次报名 2.考试接口修改

Administrator

2021-08-06 0dee81f06575d115d64adde8fc3a4ea94607f9ef

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

@@ -14,11 +14,14 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.excel.ApplyExcel;
import org.springblade.modules.apply.excel.ApplyImporter;
import org.springblade.modules.apply.excel.ApplyInfoExcel;
import org.springblade.modules.apply.service.ApplyService;
import org.springblade.modules.apply.vo.ApplyPaPerVO;
import org.springblade.modules.apply.vo.ApplyVO;
import org.springblade.modules.exam.entity.ExamPaper;
import org.springblade.modules.exam.service.ExamPaperService;
@@ -91,22 +94,33 @@
   @PostMapping("/submit")
   public R submit(@RequestBody Apply apply) throws Exception {
      if (null==apply.getId()){
         //查询人员是否已报名
         Integer isApply = applyService.getIsApply(apply);
         if (null!=isApply){
            return R.data(201,"已报名，不能重复报名");
         }
         //去生成准考证号码
         apply.setCandidateNo(getCandidateNo(apply));
         //去生成考试编号
         apply.setApplyCode(getApplyCode(apply));
         //默认通过
         apply.setApplyStatus(2);
         //默认为未考试状态
         apply.setIsExam(1);
         apply.setApplyTime(new Date());
      }
      boolean status = applyService.saveOrUpdate(apply);
      if (status){
         //内网新增
         arg.test01(arg.url+"/apply/save",apply);
//         arg.test01(arg.url+"/apply/save",apply);
         return R.data(200,"报名成功");
      }
      //内网修改
      if(null!=apply.getId()){
         //修改
         arg.test01(arg.url+"/apply/update",apply);
      }
      return R.status(applyService.saveOrUpdate(apply));
      return R.data(202,"报名失败");
   }


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

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


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

   /**
@@ -288,4 +315,20 @@
      return R.data(detail);
   }

   /**
    * 获取准考证信息
    * @param apply
    * @return
    */
   @GetMapping("/getApplyInfo")
   public R<ApplyPaPerVO> getApplyInfo(Apply apply,HttpServletResponse response) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials", "true");
      //查询考试报名详情
      ApplyPaPerVO detail = applyService.getApplyInfo(apply);
      //返回
      return R.data(detail);
   }

}