From 6d5d692edcd488a8a223571ac69a972ab8f25834 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 03 Dec 2021 17:29:34 +0800
Subject: [PATCH] 培训查询修改
---
src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml | 19 +++++++++++++++++--
src/main/java/org/springblade/modules/training/vo/TrainingRegistrationVo.java | 21 +++++++++++++++++++++
2 files changed, 38 insertions(+), 2 deletions(-)
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 282708b..ad717f0 100644
--- a/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
+++ b/src/main/java/org/springblade/modules/training/mapper/TrainingRegistrationMapper.xml
@@ -5,12 +5,12 @@
<!--报名培训分页信息-->
<select id="selectTrainingRegistrationPage" resultType="org.springblade.modules.training.vo.TrainingRegistrationVo">
SELECT
- sr.id,sr.training_time TrainingTime,sr.cancel,
+ sr.id,sr.training_time TrainingTime,sr.cancel,sr.audit_status auditStatus,
bt.dept_name AS deptName,
bt0.dept_name AS trainUnitName,
bu.real_name realName,bu.phone,bu.cardid idCardNo,bu.sex,bu.height,bu.education,
ke.start_time trainExamTime,if(ke.audit_status=1,ke.exam_name,"") trainExamName,ke.exam_type examType,
- "保安证" applyCard
+ "保安证" applyCard,bu.examination_type examinationType,bu.examination_mx examinationMx,bu.audit_time auditTime
FROM
sys_training_registration sr
LEFT JOIN
@@ -34,6 +34,14 @@
and is_exam = 1
and bu.is_train = 1
and sr.cancel = 1
+ <if test="trainingRegistration.examinationType!=null and trainingRegistration.examinationType != ''">
+ <if test="trainingRegistration.examinationType == 0">
+ and (bu.examination_type = #{trainingRegistration.examinationType} or bu.examination_type is null or bu.examination_type ='')
+ </if>
+ <if test="trainingRegistration.examinationType == 1">
+ and bu.examination_type = #{trainingRegistration.examinationType}
+ </if>
+ </if>
<if test="trainingRegistration.trainingUnitId!=null and trainingRegistration.trainingUnitId!=''">
and sr.training_unit_id = #{trainingRegistration.trainingUnitId}
</if>
@@ -58,6 +66,13 @@
<if test="trainingRegistration.cancel!=null">
and sr.cancel = #{trainingRegistration.cancel}
</if>
+ <if test="trainingRegistration.auditStatus!=null and trainingRegistration.auditStatus!=0">
+ and sr.audit_status = #{trainingRegistration.auditStatus}
+ </if>
+ <if test="trainingRegistration.examTime!=null and trainingRegistration.examTime!=''">
+ and date_format(ke.start_time,'%Y-%m-%d') = #{trainingRegistration.examTime}
+ </if>
+ order by bu.examination_type desc,ke.start_time desc,id
</select>
<!--报名培训详情信息-->
diff --git a/src/main/java/org/springblade/modules/training/vo/TrainingRegistrationVo.java b/src/main/java/org/springblade/modules/training/vo/TrainingRegistrationVo.java
index a2a409b..71bf317 100644
--- a/src/main/java/org/springblade/modules/training/vo/TrainingRegistrationVo.java
+++ b/src/main/java/org/springblade/modules/training/vo/TrainingRegistrationVo.java
@@ -83,4 +83,25 @@
* 学历
*/
private String education;
+
+ private String examTime;
+
+
+ /**
+ * 审查状态
+ */
+ private String examinationType;
+
+ /**
+ * 审查明细
+ */
+ private String examinationMx;
+
+
+ /**
+ * 审查时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date auditTime;
}
--
Gitblit v1.9.3