From 17e40e69efc755d237a7427187dcc0b590f968ba Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 11 Jun 2022 17:36:01 +0800
Subject: [PATCH] 成绩查询修改
---
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 4 ++--
src/main/java/org/springblade/modules/quartz/task/Task.java | 26 +++++++++++++-------------
2 files changed, 15 insertions(+), 15 deletions(-)
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 eecf6ea..d99d5a3 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -55,10 +55,10 @@
and es.qualified = #{examScore.qualified}
</if>
<if test="examScore.startTime!=null and examScore.startTime!=''">
- and bu.paper_time >= #{examScore.startTime}
+ and es.exam_time >= #{examScore.startTime}
</if>
<if test="examScore.endTime!=null and examScore.endTime!=''">
- and bu.paper_time <= #{examScore.endTime}
+ and es.exam_time <= #{examScore.endTime}
</if>
order by es.id desc
</select>
diff --git a/src/main/java/org/springblade/modules/quartz/task/Task.java b/src/main/java/org/springblade/modules/quartz/task/Task.java
index fac35c1..b219a41 100644
--- a/src/main/java/org/springblade/modules/quartz/task/Task.java
+++ b/src/main/java/org/springblade/modules/quartz/task/Task.java
@@ -101,8 +101,8 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- ftp.dele(fileName);
-// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+// ftp.dele(fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
}else if(substring1.equals("o")){
//获取对象字符串
String json = OutJson.TestJson(fileName);
@@ -111,8 +111,8 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- ftp.dele(fileName);
-// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+// ftp.dele(fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
}else if(substring1.equals("l")){
//用户集合数据,批量导入用户
//获取对象字符串
@@ -122,8 +122,8 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- ftp.dele(fileName);
-// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+// ftp.dele(fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
}else if(substring1.equals("t")){
//培训报名数据
//获取对象字符串
@@ -133,8 +133,8 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- ftp.dele(fileName);
-// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+// ftp.dele(fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
}else if(substring1.equals("s")){
//获取保安员证编号数据
//获取对象字符串
@@ -144,8 +144,8 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- ftp.dele(fileName);
-// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+// ftp.dele(fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
}else if(substring1.equals("u")){
//保安员审查
//获取对象字符串
@@ -155,8 +155,8 @@
//删除本地文件
MysqlCenlint.deletess(fileName);
//删除 ftp 文件
- ftp.dele(fileName);
-// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+// ftp.dele(fileName);
+ FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
}
else if(substring1.equals("f")){
//把文件下载到本地(图片文件类),测试内外网使用同一台服务器
@@ -179,7 +179,7 @@
}
} catch (Exception e) {
MysqlCenlint.deletess(fileName);
- FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
+// FtpUtil.deleteFile(ftpHost, ftpPort, ftpUserName, ftpPassword, "anbao/", fileName);
e.printStackTrace();
} finally {
//如果ftp 没有关闭,则关闭ftp
--
Gitblit v1.9.3