From 6cf1a03467d7bcfa54b6e82b1ed25529183d5997 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 18 Jan 2022 16:52:30 +0800
Subject: [PATCH] 1.考试成绩查询修改
---
src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java | 43 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 39 insertions(+), 4 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 cbc2943..8709130 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -35,6 +35,8 @@
import org.springblade.modules.exam.vo.ExamPaperVO;
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;
@@ -61,6 +63,9 @@
private final TrainingRegistrationService trainingRegistrationService;
+
+
+ private final IUserService userService;
/**
@@ -235,12 +240,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);
}
@@ -272,6 +297,16 @@
//审核通过，则生成准考证号
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);
+ }
+ }
+ }
//生成准考证号
trainingRegistration.setCandidateNo(getCandidateNo(examPaper));
}
--
Gitblit v1.9.3