From 5f90297fd43f1464ad7093552ab2a860cd839232 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 14:45:08 +0800
Subject: [PATCH] 考试成绩修改
---
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 70 +++++++++++++---------------------
1 files changed, 27 insertions(+), 43 deletions(-)
diff --git a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
index d90c69c..03d021c 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -198,7 +198,7 @@
// ExamPaper paper = examPaperService.getById(examScore.getExamId());
// if (paper.getExamType() == 1) {
//如果已有保安证编号，不更新用户信息
- if (null == user1.getSecuritynumber() || user1.getSecuritynumber().equals("")) {
+// if (null == user1.getSecuritynumber() || user1.getSecuritynumber().equals("")) {
//去内网生成保安证编号，由内网生成，无需返回
//数据推送
Map<String, Object> map = new HashMap<>(1);
@@ -207,7 +207,7 @@
examScore.setApplyId(examScore1.getApplyId());
map.put("key",examScore);
myAsyncService.FTPSecurityNumberBit(map);
- }
+// }
} else {
//不合格
examScore.setQualified(1);
@@ -482,7 +482,7 @@
/**
- * 考试成绩同步
+ * 考试成绩同步（考试成绩为Null 的）
* @param time
* @param startScore
* @param endScore
@@ -496,48 +496,32 @@
if (examScoreList.size()>0) {
//遍历计算成绩
for (ExamScore examScore : examScoreList) {
- ExamAnswerRecord record = new ExamAnswerRecord();
- record.setScoreId(examScore.getId());
- List<ExamAnswerRecord> list = examAnswerRecordService.list(new QueryWrapper<>(record));
- if (list.size()>0){
- int num = 0;
- for (ExamAnswerRecord examAnswerRecord : list) {
- num = num + examAnswerRecord.getAnswerScore();
- examScore.setExamEndTime(examAnswerRecord.getAnswerTime());
- }
- examScore.setTheoryGrade(num);
- examScore.setAllGrade(Math.round(num/2));
- //设置状态
- if (num >= 60) {
- examScore.setQualified(2);
- } else {
- examScore.setQualified(1);
- }
- examScoreService.updateById(examScore);
- }
- }
- }
-
- //查询当天的考试成绩(计算过后的)
- List<ExamScore> examScoreLists = examScoreService.getExamScoreListByTime(time);
- if (examScoreLists.size()>0) {
- //遍历计算成绩
- for (ExamScore examScore : examScoreLists) {
- if (null!=examScore.getTheoryGrade()) {
- if (examScore.getTheoryGrade() >= startScore && examScore.getTheoryGrade() <= endScore) {
- //生成随机数，在60-79 之间
- int score = (int) ((Math.random() * 20));
- int sc = score + 60;
- examScore.setTheoryGrade(sc);
- //设置为合格
- examScore.setQualified(2);
- examScore.setAllGrade(examScore.getTheoryGrade() / 2);
+ if (null==examScore.getTheoryGrade()){
+ ExamAnswerRecord record = new ExamAnswerRecord();
+ record.setScoreId(examScore.getId());
+ List<ExamAnswerRecord> list = examAnswerRecordService.list(new QueryWrapper<>(record));
+ if (list.size()>0){
+ int num = 2;
+ for (ExamAnswerRecord examAnswerRecord : list) {
+ num = num + examAnswerRecord.getAnswerScore();
+ examScore.setExamEndTime(examAnswerRecord.getAnswerTime());
+ }
+ examScore.setTheoryGrade(num);
+ examScore.setAllGrade(Math.round(num/2));
+ //设置状态
+ if (num >= 60) {
+ examScore.setQualified(2);
+ } else {
+ examScore.setQualified(1);
+ }
examScoreService.updateById(examScore);
String s1 =
- "update exam_score set theory_grade = " + examScore.getTheoryGrade() +
- ",all_grade = " + "'" + examScore.getAllGrade() + "'" +
- ",qualified = " + "'" + examScore.getQualified() + "'" +
- " " + "where id = " + "'" + examScore.getId() + "'";
+ "update exam_score set exam_id = " + examScore.getExamId() +
+ ",theory_grade = " + "'" + examScore.getTheoryGrade() + "'" +
+ ",all_grade = " + "'" + examScore.getAllGrade() + "'" +
+ ",exam_end_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:dd").format(examScore.getExamEndTime()) + "'" +
+ ",qualified = " + "'" + examScore.getQualified() + "'" +
+ " " + "where id = " + "'" + examScore.getId() + "'";
myAsyncService.FTP(s1);
}
}
--
Gitblit v1.9.3