From c8ebf3038d2a7f69d9eb40f5a276dc3fa826fa9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 10 Aug 2021 21:42:52 +0800
Subject: [PATCH] 报名接口修改,考试计算成绩接口修改，对比答案修改为对比所有题目
---
src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java | 105 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 81 insertions(+), 24 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
index a75855d..16898f0 100644
--- a/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
+++ b/src/main/java/org/springblade/modules/apply/service/impl/ApplyServiceImpl.java
@@ -11,6 +11,7 @@
import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombination;
import org.springblade.common.utils.arg;
import org.springblade.core.mp.support.Condition;
+import org.springblade.core.tool.api.R;
import org.springblade.modules.apply.entity.Apply;
import org.springblade.modules.apply.excel.ApplyExcel;
import org.springblade.modules.apply.excel.ApplyInfoExcel;
@@ -27,9 +28,7 @@
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
/**
* 考试报名服务实现类
@@ -85,26 +84,47 @@
}
+ /**
+ * 导入报名信息
+ * @param data
+ * @param isCovered
+ */
@Override
@Transactional(rollbackFor = Exception.class)
- public void importApply(List<ApplyInfoExcel> data, Boolean isCovered) {
- data.forEach(applyInfoExcel -> {
- //通过准考证号
- if (null!=applyInfoExcel.getCandidateNo() && applyInfoExcel.getIdCardNo()!=""){
- Apply apply = new Apply();
- apply.setCandidateNo(applyInfoExcel.getCandidateNo());
- //查询报名信息
- Apply apply1 = baseMapper.selectOne(Condition.getQueryWrapper(apply));
- apply1.setIsExam(2);
- baseMapper.updateById(apply1);
- //内网新增
- try {
-// arg.test01(arg.url+"/apply/update",apply1);
- } catch (Exception e) {
- e.printStackTrace();
+ public void importApply(List<ApplyExcel> data, Boolean isCovered) {
+ data.forEach(applyExcel -> {
+ //查询用户信息
+ User user = new User();
+ user.setCardid(applyExcel.getIdCardNo());
+ User user1 = userService.getOne(Condition.getQueryWrapper(user));
+ if (null!=user1){
+ //未报名的新增，已报名的不做处理
+ if (null==user1.getIsApply()) {
+ Apply apply1 = new Apply();
+ apply1.setApplyStatus(2);
+ //默认为未考试状态
+ apply1.setIsExam(1);
+ apply1.setApplyTime(new Date());
+ apply1.setUserId(user1.getId());
+ this.save(apply1);
+ //修改保安报名状态
+ user1.setIsApply(1);
+ userService.updateById(user1);
+ }else {
+ if (user1.getIsApply()==2) {
+ Apply apply1 = new Apply();
+ apply1.setApplyStatus(2);
+ //默认为未考试状态
+ apply1.setIsExam(1);
+ apply1.setApplyTime(new Date());
+ apply1.setUserId(user1.getId());
+ this.save(apply1);
+ //修改保安报名状态
+ user1.setIsApply(1);
+ userService.updateById(user1);
+ }
}
}
-
});
}
@@ -121,9 +141,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";
}
@@ -141,19 +161,34 @@
}
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 = getCandidateNoCount(result);
+ int count = this.getCandidateNoCount(result);
if (count==0){
return result + "0000";
}
@@ -313,4 +348,26 @@
public List<Long> getApplyIds() {
return baseMapper.getApplyIds();
}
+
+ /**
+ * 查询报名清册信息
+ * @param apply 报名信息
+ * @return
+ */
+ @Override
+ public Map<String,Object> getApplyDetailList(ApplyVO apply) {
+ //创建 map 对象
+ Map<String, Object> map = new HashMap<>(3);
+ //查询考试信息
+ ExamPaper paper = examPaperService.getById(apply.getExamId());
+ map.put("examName",paper.getExamName());
+ //查询已报名的总人数
+ int num = baseMapper.getApplyDeatailNum(paper.getId());
+ map.put("num",num);
+ //查询已报名的的人信息集合
+ List<ApplyVO> applyVOList = baseMapper.getApplyDetailList(paper.getId());
+ map.put("applyList",applyVOList);
+ //返回数据
+ return map;
+ }
}
--
Gitblit v1.9.3