From 45eb881ac05b0f9f95deae5eb203c23a7546efcb Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 05 Nov 2021 18:35:16 +0800
Subject: [PATCH] 成绩修改审核接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 18 ++++++++++++++++--
1 files changed, 16 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 c2e1386..698a148 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -53,6 +53,7 @@
<!--带坐标-->
<select id="selectUserPages" resultMap="userResultMap">
select
+ distinct
bu.*,
sll.longitude,sll.latitude,
bd.dept_name
@@ -78,6 +79,10 @@
blade_role br
on
br.id = bu.role_id
+ left join
+ sys_training_registration str
+ on
+ bu.id = str.user_id
where
bu.is_deleted = 0
and bd.parent_id!=1425365577303621633
@@ -100,6 +105,9 @@
</if>
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
+ </if>
+ <if test="user.trainingUnitId!=null and user.trainingUnitId != ''">
+ and str.training_unit_id = #{user.trainingUnitId}
</if>
<if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
@@ -207,7 +215,7 @@
<!--通过 身份证号查询用户信息-->
<select id="getUserInfoByIdCardNo" resultType="org.springblade.modules.system.entity.User">
- SELECT id, name, real_name RealName
+ SELECT id, name, real_name RealName,securitynumber
FROM blade_user
where 1=1
and is_deleted = 0
@@ -389,7 +397,11 @@
<!--计算保安人员年龄-->
<select id="getUserAgeById" resultType="org.springblade.modules.system.vo.UserVO">
- select id,ifnull(TIMESTAMPDIFF(YEAR, birthday, CURDATE()),0) age from blade_user where id = #{userId}
+ select id,ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(cardid,7,4),0) age,securitynumber,cardid
+ from
+ blade_user
+ where
+ id = #{userId}
</select>
@@ -571,4 +583,6 @@
and bu.is_deleted = 0
and br.role_alias = "保安"
</select>
+
+
</mapper>
--
Gitblit v1.9.3