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/mapper/ExamScoreMapper.xml | 2 +-
src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java | 9 +++++++++
2 files changed, 10 insertions(+), 1 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 5d86b5a..a1099f3 100644
--- a/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
+++ b/src/main/java/org/springblade/modules/exam/controller/ExamScoreController.java
@@ -475,6 +475,15 @@
return R.data(examScoreService.getExamStatisInfo(information));
}
+ /**
+ * 获取当前时间
+ * @param
+ */
+ @GetMapping("/getNowDate")
+ public R getNowDate() {
+ return R.data(System.currentTimeMillis());
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
index a2cd388..c9dcf19 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -69,7 +69,7 @@
SELECT
es.id,es.theory_grade theoryGrade,ifnull(learn_grade,-1) learnGrade,es.user_id userId,es.exam_id examId,
es.exam_time examTime,all_grade allGrade,exam_end_time examEndTime,qualified,es.candidate_no candidateNo,
- ke.exam_name examName,date_format(ke.start_time,'%Y-%m-%d') startTime,date_format(ke.end_time,'%Y-%m-%d') endTime,
+ ke.exam_name examName,date_format(ke.start_time,'%Y-%m-%d') startTime,date_format(ke.end_time,'%Y-%m-%d %H:%i:%s') endTime,
str.is_exam isExam,
bu.real_name securityName,company,bu.account,bu.sex,bu.paper_time paperTime,bu.securitynumber securityNumber,bu.avatar,
bd.dept_name companyName,bu.user_type isPaper
--
Gitblit v1.9.3