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 | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 6b40853..63aa2cb 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamPaperController.java
@@ -278,12 +278,13 @@
public R updateAudit(@RequestBody ExamPaper examPaper){
//查询之前的审核状态，如果审核状态没有发生改变，则不会去修改审核信息
ExamPaper paper = examPaperService.getById(examPaper.getId());
+ boolean status = false;
if (null!=paper.getAuditStatus()){
//审核状态发生改变
- if (!paper.getAuditStatus().equals(examPaper.getAuditStatus())){
+// if (!paper.getAuditStatus().equals(examPaper.getAuditStatus())){
examPaper.setAuditTime(new Date());
//修改考试审核状态
- boolean status = examPaperService.updateById(examPaper);
+ status = examPaperService.updateById(examPaper);
//数据同步
String s1 =
"update ksxt_exam set audit_status = " + "'" + examPaper.getAuditStatus()+ "'"
@@ -308,8 +309,10 @@
}
}
}
- //生成准考证号
- trainingRegistration.setCandidateNo(getCandidateNo(examPaper));
+ if(null==trainingRegistration.getCandidateNo() || trainingRegistration.getCandidateNo().equals("")){
+ //生成准考证号
+ trainingRegistration.setCandidateNo(getCandidateNo(examPaper));
+ }
}
//审核不通过
if (examPaper.getAuditStatus()==2) {
@@ -330,10 +333,10 @@
});
}
return R.status(status);
- }
+// }
}
//返回
- return R.status(false);
+ return R.status(status);
}
/**
@@ -430,6 +433,17 @@
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