From c1cbf9921b9dbe40c1c2be0608ca94c6dbe3b0e5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 16 Jun 2022 19:49:09 +0800
Subject: [PATCH] 未考试完成处理任务逻辑修改

---
 src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java |   37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
index 4b51b08..88cbf1a 100644
--- a/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/training/service/impl/TrainingRegistrationServiceImpl.java
@@ -511,29 +511,44 @@
 							//计算成绩
 							int sum = examAnswerRecordList.stream().mapToInt(ExamAnswerRecord::getAnswerScore).sum();
 							examScore1.setTheoryGrade(sum);
+							examScore1.setExamEndTime(examAnswerRecordList.get(examAnswerRecordList.size()).getAnswerTime());
+							examScore.setAllGrade(Math.round(sum/2));
 							if (sum>=60){
 								//暂未录入实操成绩
 								examScore1.setQualified(2);
 							}else {
 								examScore1.setQualified(1);
 							}
+							//更新成绩数据
+							examScoreService.updateById(examScore1);
+							//数据同步
+							String s =
+								"update sys_training_registration set is_exam = " + trainingRegistration1.getIsExam() +
+									" " + "where id = " + "'" + trainingRegistration1.getId() + "';" +
+								"update exam_score set theory_grade = " + examScore1.getTheoryGrade() +
+									",qualified = " + "'" + examScore1.getQualified() + "'" +
+									",exam_end_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:dd").format(examScore.getExamEndTime()) + "'" +
+									",all_grade = " + "'" + examScore.getAllGrade() + "'" +
+									" " + "where id = " + "'" + examScore1.getId() + "'";
+							myAsyncService.FTP(s);
 						}else {
 							//理论成绩设置为0
 							examScore1.setTheoryGrade(0);
+							examScore1.setAllGrade(0);
 							//不合格
 							examScore1.setQualified(1);
+							//更新成绩数据
+							examScoreService.updateById(examScore1);
+							//数据同步
+							String s =
+								"update sys_training_registration set is_exam = " + trainingRegistration1.getIsExam() +
+									" " + "where id = " + "'" + trainingRegistration1.getId() + "';" +
+								"update exam_score set theory_grade = " + examScore1.getTheoryGrade() +
+									",qualified = " + "'" + examScore1.getQualified() + "'" +
+									",all_grade = " + "'" + examScore.getAllGrade() + "'" +
+									" " + "where id = " + "'" + examScore1.getId() + "'";
+							myAsyncService.FTP(s);
 						}
-						//更新成绩数据
-						examScoreService.updateById(examScore1);
-
-						//数据同步
-						String s =
-							"update sys_training_registration set is_exam = " + trainingRegistration1.getIsExam() +
-								" " + "where id = " + "'" + trainingRegistration1.getId() + "';" +
-							"update exam_score set theory_grade = " + examScore1.getTheoryGrade() +
-								",qualified = " + "'" + examScore1.getQualified() + "'" +
-								" " + "where id = " + "'" + examScore1.getId() + "'";
-						myAsyncService.FTP(s);
 					});
 				}else {
 					//数据同步

--
Gitblit v1.9.3