From 0dee81f06575d115d64adde8fc3a4ea94607f9ef Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 06 Aug 2021 11:44:17 +0800
Subject: [PATCH] 1.考试报名新增判断,同一人,同一场考试,已报名且未考试,审核通过和待审核的不能再次报名 2.考试接口修改
---
src/main/java/org/springblade/modules/apply/controller/ApplyController.java | 225 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 214 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
index 076d35f..393253d 100644
--- a/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
+++ b/src/main/java/org/springblade/modules/apply/controller/ApplyController.java
@@ -4,16 +4,34 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import net.sourceforge.pinyin4j.PinyinHelper;
+import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
+import net.sourceforge.pinyin4j.format.HanyuPinyinOutputFormat;
+import net.sourceforge.pinyin4j.format.HanyuPinyinToneType;
+import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
+import org.springblade.common.utils.arg;
+import org.springblade.core.excel.util.ExcelUtil;
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;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
+import java.util.*;
/**
* @author zhongrj
@@ -26,6 +44,8 @@
public class ApplyController {
private final ApplyService applyService;
+
+ private final ExamPaperService examPaperService;
/**
* 自定义分页
@@ -72,24 +92,87 @@
* @param apply 考试报名信息对象
*/
@PostMapping("/submit")
- public R submit(@RequestBody Apply apply) {
- if (null!=apply.getId()){
- //去生成准考证
+ 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());
}
- return R.status(applyService.saveOrUpdate(apply));
+ boolean status = applyService.saveOrUpdate(apply);
+ if (status){
+ //内网新增
+// arg.test01(arg.url+"/apply/save",apply);
+ return R.data(200,"报名成功");
+ }
+ //内网修改
+ if(null!=apply.getId()){
+ //修改
+ arg.test01(arg.url+"/apply/update",apply);
+ }
+ return R.data(202,"报名失败");
+ }
+
+
+ /**
+ * 导入报名考试数据
+ */
+ @PostMapping("import-apply")
+ @ApiOperation(value = "导入报名考试数据", notes = "传入excel")
+ public R importUser(MultipartFile file, Integer isCovered) {
+ ApplyImporter applyImporter = new ApplyImporter(applyService, false);
+ ExcelUtil.save(file, applyImporter, ApplyInfoExcel.class);
+ return R.success("操作成功");
}
/**
- * 生成准考证
- * @param apply 报名对象信息
+ * 导出模板
+ */
+ @GetMapping("export-template")
+ @ApiOperation(value = "导出模板")
+ public void exportUser(HttpServletResponse response) {
+ 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);
+ }
+
+ /**
+ * 生成准考证号码
+ * @param apply 考试报名信息对象
*/
private String getCandidateNo(Apply apply) {
- String candidateNo = null;
- if (null!=apply.getExamTime()){
- String year = ((Integer) apply.getExamTime().getYear()).toString().substring(2,3);
+ //获取考试信息
+ ExamPaper examPaper = examPaperService.getById(apply.getExamId());
+ if (null!=examPaper.getStartTime()){
+ String format = new SimpleDateFormat("yyyy-MM-dd").format(examPaper.getStartTime());
+ String year = format.substring(2,4);
String quarter = null;
- int month = apply.getExamTime().getMonth();
+ String months = null;
+ String days = null;
+ int month = Integer.parseInt(format.substring(5,7));
+ int day = Integer.parseInt(format.substring(8,10));
if (month>0 && month<=3){
quarter = "C";
}
@@ -102,8 +185,111 @@
if (month>9 && month<=12){
quarter = "D";
}
+ if (month<=9){
+ months = "0" + month;
+ }
+ if (day<=9){
+ days = "0" + day;
+ }
+ //获取考试名称前缀,去除数字,字母
+ String examName
+ = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0,1);
+
+ //前缀 = 年的最后两位 + 月份(两位) + 考试名称(中文拼音)首字母(去除数字,字母) + 考试类型 + 季度拼音首字母大写(春季就是 C)
+ String result = year
+ + months
+ + toFirstChar(examName).toUpperCase()
+ + examPaper.getExamType()
+ + quarter;
+ //查询是当前前缀已生成的数量
+ int count = applyService.getCandidateNoCount(result);
+ if (count==0){
+ return result + "0000";
+ }
+ //格式化
+ DecimalFormat decimalFormat = new DecimalFormat("0000");
+ //返回
+ return result + (decimalFormat.format(count++));
}
- return "2107XN0001";
+ return null;
+ }
+
+
+ /**
+ * 生成报名编号
+ * @param apply 考试报名信息对象
+ */
+ private String getApplyCode(Apply apply) {
+ //获取考试信息
+ ExamPaper examPaper = examPaperService.getById(apply.getExamId());
+ if (null!=examPaper.getStartTime()){
+ String format = new SimpleDateFormat("yyyy-MM-dd").format(examPaper.getStartTime());
+ 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));
+ if (month>0 && month<=3){
+ quarter = "C";
+ }
+ if (month>3 && month<=6){
+ quarter = "X";
+ }
+ if (month>6 && month<=9){
+ quarter = "Q";
+ }
+ if (month>9 && month<=12){
+ quarter = "D";
+ }
+ if (month<=9){
+ months = "0" + month;
+ }
+ if (day<=9){
+ days = "0" + day;
+ }
+ //获取考试名称前缀,去除数字,字母
+ String examName
+ = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0,1);
+
+ //前缀 = 年的最后两位 + 月份(两位) + 考试名称(中文拼音)首字母(去除数字,字母) + 考试类型 + 季度拼音首字母大写(春季就是 C)
+ String result = year
+ + months
+ + toFirstChar(examName).toUpperCase()
+ + examPaper.getExamType()
+ + quarter;
+ //生成随机数
+ UUID uuid = UUID.randomUUID();
+ //返回
+ return result + uuid.toString().replaceAll("\\-","");
+ }
+ return null;
+ }
+
+ /**
+ * 获取字符串拼音的第一个字母
+ * @param chinese
+ * @return
+ */
+ private String toFirstChar(String chinese){
+ String pinyinStr = "";
+ char[] newChar = chinese.toCharArray();
+ //转为单个字符
+ HanyuPinyinOutputFormat defaultFormat = new HanyuPinyinOutputFormat();
+ defaultFormat.setCaseType(HanyuPinyinCaseType.LOWERCASE);
+ defaultFormat.setToneType(HanyuPinyinToneType.WITHOUT_TONE);
+ for (int i = 0; i < newChar.length; i++) {
+ if (newChar[i] > 128) {
+ try {
+ pinyinStr += PinyinHelper.toHanyuPinyinStringArray(newChar[i], defaultFormat)[0].charAt(0);
+ } catch (BadHanyuPinyinOutputFormatCombination e) {
+ e.printStackTrace();
+ }
+ }else{
+ pinyinStr += newChar[i];
+ }
+ }
+ return pinyinStr;
}
/**
@@ -112,6 +298,7 @@
*/
@PostMapping("/remove")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) {
+ arg.sendPostRemoveByIds(arg.url+"/apply/remove",ids);
return R.status(applyService.removeByIds(Func.toLongList(ids)));
}
@@ -128,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);
+ }
+
}
--
Gitblit v1.9.3