From bed0d07586e148a43a03dcfa233bfe443dcb78b2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 01 Dec 2023 18:04:40 +0800
Subject: [PATCH] 考试成绩导出修改

---
 src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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..235889e 100644
--- a/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
+++ b/src/main/java/org/springblade/modules/exam/mapper/ExamScoreMapper.xml
@@ -378,10 +378,14 @@
         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.permanent_residence_address permanentResidenceAddress,bud.dwell_address dwellAddress,
+        bud.member_of_family memberOfFamily,bud.work_experience workExperience,bud.education_experience educationExperience
         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

--
Gitblit v1.9.3