From 41d8611f58087cf58254c9d2b9bf8e22c1f55169 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 07 Dec 2023 12:06:03 +0800
Subject: [PATCH] 保安员字段修改
---
src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml | 43 ++++++++++++++++++-------------------------
1 files changed, 18 insertions(+), 25 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 89034eb..67f3d35 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -72,29 +72,17 @@
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,bu.unit_name unitName
+ bd.dept_name companyName,bu.user_type isPaper,bud.unit_name unitName
from
exam_score es
- left join
- ksxt_exam ke
- on
- ke.id = es.exam_id
- left join
- blade_user bu
- on
- es.user_id = bu.id
- left join
- blade_dept bd
- on
- bd.id = bu.dept_id
+ left join ksxt_exam ke on ke.id = es.exam_id
+ left join blade_user bu on es.user_id = bu.id
+ left join blade_user_detail bud on bud.user_id = bu.id
+ left join blade_dept bd on bd.id = bu.dept_id
left join sys_information si on si.departmentid = bd.id
left join sys_jurisdiction sj on sj.id = si.jurisdiction
- left join
- sys_training_registration str
- on
- str.id = es.apply_id
- where
- 1=1 and es.is_deleted = 0
+ left join sys_training_registration str on str.id = es.apply_id
+ where 1=1 and es.is_deleted = 0
and (str.is_exam = 2 or str.is_exam = 3 or str.is_exam = 4 or str.is_exam = 5)
<if test="examScore.examName!=null and examScore.examName!=''">
and ke.exam_name like concat('%', #{examScore.examName},'%')
@@ -103,7 +91,7 @@
and bd.dept_name like concat('%', #{examScore.companyName},'%')
</if>
<if test="examScore.unitName!=null and examScore.unitName!=''">
- and bu.unit_name like concat('%', #{examScore.unitName},'%')
+ and bud.unit_name like concat('%', #{examScore.unitName},'%')
</if>
<if test="examScore.securityName!=null and examScore.securityName!=''">
and bu.real_name like concat('%', #{examScore.securityName},'%')
@@ -368,9 +356,9 @@
<select id="getExamScoreList" resultType="org.springblade.modules.exam.excel.ExportExamScoreExcel">
SELECT
ke.exam_name examName,
- bu.real_name securityName,bu.cardid idCardNo,bu.unit_name unitName,bu.securitynumber as securityNumber,
+ bu.real_name securityName,bu.cardid idCardNo,bu.securitynumber as securityNumber,
bd.dept_name companyName,
- es.exam_time examTime,exam_end_time examEndTime,es.candidate_no candidateNo,bu.registered,
+ es.exam_time examTime,exam_end_time examEndTime,es.candidate_no candidateNo,
es.theory_grade theoryGrade,
case when es.learn_grade=0 then '合格'
when es.learn_grade=1 then '不合格'
@@ -378,10 +366,15 @@
case when es.qualified=0 then '合格'
when es.qualified=1 then '不合格'
when es.qualified=2 then '暂未录入实操成绩'
- end as qualified
+ end as qualified,
+ bud.marriage_status marriageStatus,bud.sign_level signLevel,bud.unit_name unitName,
+ bud.permanent_residence_address permanentResidenceAddress,bud.dwell_address dwellAddress,
+ bud.member_of_family memberOfFamily,bud.work_experience workExperience,bud.education_experience educationExperience,
+ bud.acceptance_police_unit acceptancePoliceUnit,bud.acceptance_person acceptancePerson,bud.acceptance_time acceptanceTime
from exam_score es
left join ksxt_exam ke on ke.id = es.exam_id
- left join blade_user bu on es.user_id = bu.id
+ left join blade_user bu on es.user_id = bu.id and bu.is_deleted = 0
+ left join blade_user_detail bud on bud.user_id = bu.id and bud.is_deleted = 0
left join blade_dept bd on bd.id = bu.dept_id
left join sys_training_registration str on str.id = es.apply_id
left join sys_information si on si.departmentid = bd.id
@@ -396,7 +389,7 @@
and bd.dept_name like concat('%', #{examScore.companyName},'%')
</if>
<if test="examScore.unitName!=null and examScore.unitName!=''">
- and bu.unit_name like concat('%', #{examScore.unitName},'%')
+ and bud.unit_name like concat('%', #{examScore.unitName},'%')
</if>
<if test="examScore.securityName!=null and examScore.securityName!=''">
and bu.real_name like concat('%', #{examScore.securityName},'%')
--
Gitblit v1.9.3