From c273bf2f4e425c14ff9bddbc4c3bf5b647622fd9 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 09 Sep 2023 14:10:13 +0800
Subject: [PATCH] 成绩导出，系统使用有效期修改
---
src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java | 2 +-
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 2 +-
src/main/java/org/springblade/modules/exam/excel/ExportExamScoreExcel.java | 4 ++++
src/main/resources/application.yml | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
index 9e37982..b0f4db2 100644
--- a/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
+++ b/src/main/java/org/springblade/modules/auth/endpoint/BladeTokenEndPoint.java
@@ -117,7 +117,7 @@
UserInfo userInfo = granter.grant(tokenParameter);
try {
- Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-09-11").getTime();
+ Long parse = new SimpleDateFormat("yyyy-MM-dd").parse("2023-09-20").getTime();
long now= System.currentTimeMillis();
if (parse < now){
throw new ServiceException("试用已到期");
diff --git a/src/main/java/org/springblade/modules/exam/excel/ExportExamScoreExcel.java b/src/main/java/org/springblade/modules/exam/excel/ExportExamScoreExcel.java
index f560ddb..e12b869 100644
--- a/src/main/java/org/springblade/modules/exam/excel/ExportExamScoreExcel.java
+++ b/src/main/java/org/springblade/modules/exam/excel/ExportExamScoreExcel.java
@@ -49,6 +49,10 @@
@ExcelProperty("身份证号码")
private String idCardNo;
+ @ColumnWidth(50)
+ @ExcelProperty("身份证住址")
+ private String registered;
+
@ColumnWidth(20)
@ExcelProperty("准考证号")
private String candidateNo;
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 8d10365..89034eb 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -370,7 +370,7 @@
ke.exam_name examName,
bu.real_name securityName,bu.cardid idCardNo,bu.unit_name unitName,bu.securitynumber as securityNumber,
bd.dept_name companyName,
- es.exam_time examTime,exam_end_time examEndTime,es.candidate_no candidateNo,
+ es.exam_time examTime,exam_end_time examEndTime,es.candidate_no candidateNo,bu.registered,
es.theory_grade theoryGrade,
case when es.learn_grade=0 then '合格'
when es.learn_grade=1 then '不合格'
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d5a1847..951e481 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -43,7 +43,7 @@
session-stat-max-count: 10
servlet:
multipart:
- location: /tmp/undertow
+ location: D:\tmp\undertow
# mybatis
--
Gitblit v1.9.3