From cb04ed62736efe70cf5babe534220b4ae4c1ca67 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 20 Jan 2022 21:08:42 +0800
Subject: [PATCH] 1. 定时任务调整 2. 成绩修改审核通过修改状态调整 3. 考试统计查询修改
---
src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java | 185 +++++++++++++++++++++++++++++++++------------
1 files changed, 134 insertions(+), 51 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
index 8b2421d..63aa2cb 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -33,7 +33,11 @@
import org.springblade.modules.exam.service.ExamPaperService;
import org.springblade.modules.exam.vo.ExamPaperSubjectVO;
import org.springblade.modules.exam.vo.ExamPaperVO;
+import org.springblade.modules.exam.vo.ExamStatisticsVO;
+import org.springblade.modules.exam.vo.ExamSubjectChoicesVO;
import org.springblade.modules.exam.wrapper.ExamPaperWrapper;
+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.service.TrainingRegistrationService;
@@ -60,6 +64,9 @@
private final TrainingRegistrationService trainingRegistrationService;
+
+
+ private final IUserService userService;
/**
@@ -194,8 +201,8 @@
@GetMapping("/queryRandomSubject")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "考试题目绑定", notes = "传入exam")
- public R<List> queryRandomSubject(@ApiParam(value = "主键集合") ExamPaper exam) {
- List<ExamPaperSubjectVO> subject = examPaperService.queryRandomSubject(exam);
+ public R<List> queryRandomSubject(@ApiParam(value = "主键集合") ExamPaperVO exam) {
+ List<ExamSubjectChoicesVO> subject = examPaperService.queryRandomSubject(exam);
return R.data(subject);
}
@@ -234,12 +241,32 @@
/**
* 查询考生考试信息
- * @param userId 用户id
+ * @param examPaper 用户id
* @return
*/
- @GetMapping("/getExamDetail")
- public R getExamDetail(String userId){
- return R.data(examPaperService.getExamDetail(userId));
+ @PostMapping("/getExamDetail")
+ public R getExamDetail(@RequestBody ExamPaperVO examPaper){
+ System.out.println("examPaper = " + examPaper);
+ return R.data(examPaperService.getExamDetail(examPaper));
+ }
+
+ /**
+ * 考试名单确认
+ * @param
+ * @return
+ */
+ @PostMapping("/applyConfirm")
+ public R applyConfirm(@RequestBody ExamPaper exam) {
+ exam.setConfirmTime(new Date());
+ boolean status = examPaperService.updateById(exam);
+ //内网数据同步
+ String s1 =
+ "update ksxt_exam set confirm_user = " + "'" + exam.getConfirmUser()+ "'"
+ + ",confirm_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(exam.getConfirmTime())+ "'"
+ + " " +"where id = " + "'" + exam.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ //返回数据
+ return R.data(status);
}
@@ -249,43 +276,64 @@
*/
@PostMapping("/update-audit")
public R updateAudit(@RequestBody ExamPaper examPaper){
- examPaper.setAuditTime(new Date());
- //修改考试审核状态
- boolean status = examPaperService.updateById(examPaper);
- //数据同步
- String s1 =
- "update ksxt_exam set audit_status = " + "'" + examPaper.getAuditStatus()+ "'"
- + ",audit_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getAuditTime())+ "'"
- + " " +"where id = " + "'" + examPaper.getId() + "'";
- FtpUtil.sqlFileUpload(s1);
- //查询当前考试已报名的人员培训报名数据集合
- List<TrainingRegistration> trainingRegistrations = examPaperService.getTrainList(examPaper.getId());
-// System.out.println("trainingRegistrations = " + trainingRegistrations);
- if (trainingRegistrations.size()>0) {
- trainingRegistrations.forEach(trainingRegistration -> {
- //生成准考证号
- trainingRegistration.setCandidateNo(getCandidateNo(examPaper));
- //审核通过
- if (examPaper.getAuditStatus()==1) {
- trainingRegistration.setAuditStatus(1);
- }
- //审核不通过
- if (examPaper.getAuditStatus()==2) {
- trainingRegistration.setAuditStatus(2);
- }
- //待审核
- if (examPaper.getAuditStatus()==3) {
- trainingRegistration.setAuditStatus(3);
- }
- //修改培训报名信息
- trainingRegistrationService.updateById(trainingRegistration);
+ //查询之前的审核状态，如果审核状态没有发生改变，则不会去修改审核信息
+ ExamPaper paper = examPaperService.getById(examPaper.getId());
+ boolean status = false;
+ if (null!=paper.getAuditStatus()){
+ //审核状态发生改变
+// if (!paper.getAuditStatus().equals(examPaper.getAuditStatus())){
+ examPaper.setAuditTime(new Date());
+ //修改考试审核状态
+ status = examPaperService.updateById(examPaper);
//数据同步
- String s2 =
- "update sys_training_registration set candidate_no = " + "'" + trainingRegistration.getCandidateNo()+ "'"
- + ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'"
- + " " +"where id = " + "'" + trainingRegistration.getId() + "'";
- FtpUtil.sqlFileUpload(s2);
- });
+ String s1 =
+ "update ksxt_exam set audit_status = " + "'" + examPaper.getAuditStatus()+ "'"
+ + ",audit_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(examPaper.getAuditTime())+ "'"
+ + " " +"where id = " + "'" + examPaper.getId() + "'";
+ FtpUtil.sqlFileUpload(s1);
+ //查询当前考试已报名的人员培训报名数据集合
+ List<TrainingRegistration> trainingRegistrations = examPaperService.getTrainList(examPaper.getId());
+// System.out.println("trainingRegistrations = " + trainingRegistrations);
+ if (trainingRegistrations.size()>0) {
+ trainingRegistrations.forEach(trainingRegistration -> {
+ //审核通过，则生成准考证号
+ if (examPaper.getAuditStatus()==1) {
+ trainingRegistration.setAuditStatus(1);
+ //查询当前用户审核状态，如果异常，则审核不通过
+ User user = userService.getById(trainingRegistration.getUserId());
+ if (null!=user){
+ if (null!=user.getExaminationType() && !user.getExaminationType().equals("")){
+ if (user.getExaminationType().equals("1")){
+ //审核不通过
+ trainingRegistration.setAuditStatus(2);
+ }
+ }
+ }
+ if(null==trainingRegistration.getCandidateNo() || trainingRegistration.getCandidateNo().equals("")){
+ //生成准考证号
+ trainingRegistration.setCandidateNo(getCandidateNo(examPaper));
+ }
+ }
+ //审核不通过
+ if (examPaper.getAuditStatus()==2) {
+ trainingRegistration.setAuditStatus(2);
+ }
+ //待审核
+ if (examPaper.getAuditStatus()==3) {
+ trainingRegistration.setAuditStatus(3);
+ }
+ //修改培训报名信息
+ trainingRegistrationService.updateById(trainingRegistration);
+ //数据同步
+ String s2 =
+ "update sys_training_registration set candidate_no = " + "'" + trainingRegistration.getCandidateNo()+ "'"
+ + ",audit_status = " + "'" + trainingRegistration.getAuditStatus() + "'"
+ + " " +"where id = " + "'" + trainingRegistration.getId() + "'";
+ FtpUtil.sqlFileUpload(s2);
+ });
+ }
+ return R.status(status);
+// }
}
//返回
return R.status(status);
@@ -319,6 +367,8 @@
}
if (month<=9){
months = "0" + month;
+ }else {
+ months = String.valueOf(month);
}
if (day<=9){
days = "0" + day;
@@ -333,8 +383,8 @@
type = "m";
}
//获取考试名称前缀,去除数字，字母
- String examName
- = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0,1);
+// String examName
+// = examPaper.getExamName().replaceAll("\\s*", "").replaceAll("[^(\\u4e00-\\u9fa5)]", "").substring(0,1);
//前缀 = 年的最后两位 + 月份（两位） + 考试名称（中文拼音）首字母（去除数字，字母） + 考试类型 + 季度拼音首字母大写（春季就是 C）
// String result = year
@@ -344,23 +394,56 @@
// + quarter;
//前缀 = 年的最后两位 + 月份（两位） + 日 （两位） + 考试类型 正式考试 z 模拟考试 m
- String result = year
+ String pre = year
+ months
+ days
+ type;
- //查询是当前前缀已生成的数量
- int count = examPaperService.getCandidateNoCount(result);
- if (count==0){
- return result + "0000";
- }
+ //查询是当前前缀已生成准考证号码最大的一位
+ int count = examPaperService.getCandidateNoCount(pre);
+ String result = null;
//格式化
DecimalFormat decimalFormat = new DecimalFormat("0000");
+ count++;
+ result = pre + (decimalFormat.format(count));
//返回
- return result + (decimalFormat.format(count++));
+ return result;
}
return null;
}
+ /**
+ * 考试中页面刷新,1查询所有的答题信息，2查询所有的已答信息 3其他信息
+ * @param examPaperVO 必须包含 scoreId
+ * @return
+ */
+ @GetMapping("/getExamRefreshInfo")
+ public R getExamRefreshInfo(ExamPaperVO examPaperVO){
+ return R.data(examPaperService.getExamRefreshInfo(examPaperVO));
+ }
+
+ /**
+ * 查询考试统计信息
+ * @param examPaperVO
+ * @return
+ */
+ @GetMapping("/getExamStatistics")
+ public R getExamStatistics(ExamPaperVO examPaperVO, Query query){
+ IPage<ExamStatisticsVO> pages = examPaperService.getExamStatistics(Condition.getPage(query), examPaperVO);
+ return R.data(pages);
+ }
+
+ /**
+ * 根据考试id 统计查询考试信息
+ * @param examPaperVO
+ * @return
+ */
+ @GetMapping("/getExamInfoByExamId")
+ public R getExamInfoByExamId(ExamStatisticsVO examPaperVO, Query query){
+ IPage<ExamStatisticsVO> pages = examPaperService.getExamInfoByExamId(Condition.getPage(query), examPaperVO);
+ return R.data(pages);
+ }
+
+
}
--
Gitblit v1.9.3