From 9c6806b0462a169ce0a7d2dcc295e3634f84ef5a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 07 Dec 2021 17:41:13 +0800
Subject: [PATCH] 考试成绩修改查询修改，派遣查询接口修改，定时任务打印时间，修改为23点执行
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 1 +
src/main/java/org/springblade/modules/exam/vo/ScoreAuditRecordsVO.java | 5 +++++
src/main/java/org/springblade/modules/exam/mapper/ScoreAuditRecordsMapper.xml | 6 +++++-
src/main/java/org/springblade/modules/crontab/Crontab.java | 6 +++++-
src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml | 2 ++
5 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/crontab/Crontab.java b/src/main/java/org/springblade/modules/crontab/Crontab.java
index 2d02a93..16d9be4 100644
--- a/src/main/java/org/springblade/modules/crontab/Crontab.java
+++ b/src/main/java/org/springblade/modules/crontab/Crontab.java
@@ -7,6 +7,9 @@
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.GetMapping;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
/**
* 定时任务
* @author zhongrj
@@ -22,10 +25,11 @@
* 定时任务，每天凌晨1点执行一次，
* 自动处理之前报了名，申请了考试又没有去考试的，做缺考标记，并将报名状态修改为已取消报名
*/
- @Scheduled(cron = "* * 1 * * ?")
+ @Scheduled(cron = "* * 23 * * ?")
// @Scheduled(cron = "*/30 * * * * ?")
@GetMapping("/examApplyStatus")
public void examApplyStatus(){
+ System.out.println("执行时间："+new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
//自动处理之前报了名，申请了考试又没有去考试的，做缺考标记，并将报名状态修改为已取消报名
trainingRegistrationService.examApplyStatus();
}
diff --git a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
index e3c1b51..16a5fd6 100644
--- a/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
+++ b/src/main/java/org/springblade/modules/dispatcher/mapper/DispatcherMapper.xml
@@ -31,6 +31,8 @@
on
sj.id = sdu.jurisdiction
where 1=1
+ and bu.status =1
+ and bu.is_deleted = 0
<if test="dispatcher.jurisdiction!=null and dispatcher.jurisdiction!='' and dispatcher.jurisdiction!='1372091709474910209'">
and (sj.id = #{dispatcher.jurisdiction} or sj.parent_id = #{dispatcher.jurisdiction})
</if>
diff --git a/src/main/java/org/springblade/modules/exam/mapper/ScoreAuditRecordsMapper.xml b/src/main/java/org/springblade/modules/exam/mapper/ScoreAuditRecordsMapper.xml
index 9e88063..e350d6e 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ScoreAuditRecordsMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ScoreAuditRecordsMapper.xml
@@ -11,7 +11,8 @@
bu.sex,bu.cardid idCardNo,
ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
bu1.real_name applyRealName,
- ke.exam_name examName
+ ke.exam_name examName,
+ bt1.dept_name applyUnitName
FROM
sys_score_audit_records ssar
left join
@@ -71,6 +72,9 @@
<if test="scoreAuditRecords.trainUnitId!=null and scoreAuditRecords.trainUnitId!=''">
and bt1.id = #{scoreAuditRecords.trainUnitId}
</if>
+ <if test="scoreAuditRecords.applyUnitName!=null and scoreAuditRecords.applyUnitName!=''">
+ and bt1.dept_name like concat('%',#{scoreAuditRecords.applyUnitName},'%')
+ </if>
<if test="scoreAuditRecords.status!=null">
and ssar.status = #{scoreAuditRecords.status}
</if>
diff --git a/src/main/java/org/springblade/modules/exam/vo/ScoreAuditRecordsVO.java b/src/main/java/org/springblade/modules/exam/vo/ScoreAuditRecordsVO.java
index 666f3a5..63b6542 100644
--- a/src/main/java/org/springblade/modules/exam/vo/ScoreAuditRecordsVO.java
+++ b/src/main/java/org/springblade/modules/exam/vo/ScoreAuditRecordsVO.java
@@ -71,4 +71,9 @@
*/
private String trainUnitId;
+ /**
+ * 申请人所在单位名称
+ */
+ private String applyUnitName;
+
}
diff --git a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
index 8160cdb..3d5352d 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -67,6 +67,7 @@
<if test="trainingRegistration.isTrain!=null">
and bu.is_train = #{trainingRegistration.isTrain}
</if>
+
</select>
<!--报名培训详情信息-->
--
Gitblit v1.9.3