From 6f201b8d3743e246a71f00a9ba98d10b128fae38 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 16 Jan 2024 08:59:52 +0800
Subject: [PATCH] 派遣记录导入
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 9fcfc83..9fc16c7 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -45,6 +45,7 @@
<result column="healstats" property="healstats"/>
<result column="soil" property="soil"/>
<result column="reason_for_leav" property="reasonForLeav"/>
+ <result column="accreditationStatus" property="accreditationStatus"/>
</resultMap>
<!--带坐标-->
@@ -55,7 +56,9 @@
ifnull(TIMESTAMPDIFF(YEAR, SUBSTRING(bu.cardid, 7, 8), CURDATE()),0) AS age,
sll.longitude,sll.latitude,
bud.unit_name,
- bd.dept_name
+ bud.permanent_residence_address as registered,
+ bd.dept_name,
+ CASE WHEN sar.audit_status is not null THEN sar.audit_status ELSE -1 END AS accreditationStatus
from
blade_user bu
left join blade_user_detail bud on bud.user_id = bu.id
@@ -65,7 +68,18 @@
left join sys_live_location sll on sll.worker_id = bu.id
left join blade_role br on br.id = bu.role_id
left join sys_training_registration str on bu.id = str.user_id
+ LEFT JOIN sys_accreditation_records sar ON sar.user_id = bu.id
where bu.is_deleted = 0
+
+ <if test="user.accreditationStatus != null and user.accreditationStatus != ''">
+ <if test="user.accreditationStatus == -1">
+ AND sar.audit_status is null
+ </if>
+ <if test="user.accreditationStatus != -1">
+ AND sar.audit_status = #{user.accreditationStatus}
+ </if>
+ </if>
+
<if test="user.examinationType!=null and user.examinationType != ''">
<if test="user.examinationType == 0">
and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type ='')
@@ -424,7 +438,7 @@
<!--通过 身份证号查询用户信息-->
<select id="getUserInfoByIdCardNo" resultType="org.springblade.modules.system.entity.User">
- SELECT id, name, real_name RealName,securitynumber
+ SELECT id, name, real_name RealName,securitynumber,dept_id,dispatch
FROM blade_user
where 1=1
and is_deleted = 0
@@ -1175,6 +1189,17 @@
WHERE bu.is_deleted = 0 and bu.id = #{id}
</select>
+ <select id="getUserInfoByIdCardNoAndSecurityNumber"
+ resultType="org.springblade.modules.system.entity.User">
+
+ SELECT id, name, real_name RealName,securitynumber,dept_id
+ FROM blade_user
+ where 1=1
+ and is_deleted = 0
+ and status = 1
+ and cardid = #{cardid}
+ and securitynumber = #{securityNumber}
+ </select>
</mapper>
--
Gitblit v1.9.3