From ff8b904fd730846fadd76fb94c7b9cbde4e134b3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Dec 2021 13:34:52 +0800
Subject: [PATCH] 上岗证已制证修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 68 +++++++++++++++++++++++++++++++++-
1 files changed, 66 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 9b39a2b..b17eb39 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -149,6 +149,18 @@
and bu.dispatch = #{user.dispatch}
</if>
</if>
+ <if test="user.isAvatar==1">
+ and bu.avatar is not null and bu.avatar!=""
+ </if>
+ <if test="user.isAvatar==2">
+ and (bu.avatar is null or bu.avatar="")
+ </if>
+ <if test="user.isFingerprint==1">
+ and bu.fingerprint is not null and bu.fingerprint!=""
+ </if>
+ <if test="user.isFingerprint==2">
+ and (bu.fingerprint is null or bu.fingerprint="")
+ </if>
<if test="user.userType!=null and user.userType != ''">
and bu.user_type = #{user.userType}
</if>
@@ -158,7 +170,12 @@
<if test="user.cardid!=null and user.cardid != ''">
and bu.cardid like concat('%', #{user.cardid},'%')
</if>
- ORDER BY bu.id desc
+ <if test="user.sortName!=null and user.sortName!=''">
+ ORDER BY bu.${user.sortName} ${user.sort},bu.id desc
+ </if>
+ <if test="user.sortName==null or user.sortName==''">
+ ORDER BY bu.id desc
+ </if>
</select>
<select id="selectUserPage" resultMap="userResultMap">
@@ -459,7 +476,7 @@
<!--计算保安人员年龄-->
<select id="getUserAgeById" resultType="org.springblade.modules.system.vo.UserVO">
- select id,ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(cardid,7,4),0) age,securitynumber,cardid
+ select id,real_name realName,ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(cardid,7,4),0) age,securitynumber,cardid
from
blade_user
where
@@ -729,6 +746,18 @@
and bu.examination_type = #{user.examinationType}
</if>
</if>
+ <if test="user.isAvatar==1">
+ and bu.avatar is not null and bu.avatar!=""
+ </if>
+ <if test="user.isAvatar==2">
+ and (bu.avatar is null or bu.avatar="")
+ </if>
+ <if test="user.isFingerprint==1">
+ and bu.fingerprint is not null and bu.fingerprint!=""
+ </if>
+ <if test="user.isFingerprint==2">
+ and (bu.fingerprint is null or bu.fingerprint="")
+ </if>
<if test="user.account!=null and user.account != ''">
and bu.account like concat('%', #{user.account},'%')
</if>
@@ -829,4 +858,39 @@
and bu.dispatch = 0
and bu.id = #{id}
</select>
+
+ <!-- 批量插入时将主键值设置到参数user的userId字段上 -->
+ <insert id="batchUserList" useGeneratedKeys="true" keyProperty="id">
+ insert into blade_user
+ (id,
+ tenant_id,account,password,name,real_name,avatar,email,phone,sex,
+ role_id,dept_id,cardid,nativePlace,nation,fingerprint,education,
+ politicaloutlook,healstats,height,address,registered,securitynumber,
+ hold,jurisdiction,examination_type,status,is_deleted,dispatch,create_time
+ )
+ values
+ <foreach collection="list" item="user" separator=",">
+ (#{user.id},
+ #{user.tenantId},#{user.account},#{user.password},#{user.name},#{user.realName},#{user.avatar},#{user.email},#{user.phone},#{user.sex},
+ #{user.roleId},#{user.deptId},#{user.cardid},#{user.nativeplace},#{user.nation},#{user.fingerprint},#{user.education},
+ #{user.politicaloutlook},#{user.healstats},#{user.height},#{user.address},#{user.registered},#{user.securitynumber},
+ #{user.hold},#{user.jurisdiction},#{user.examinationType},#{user.status},#{user.isDeleted},#{user.dispatch},#{user.createTime}
+ )
+ </foreach>
+ </insert>
+
+ <!-- 批量插入时将主键值设置到参数user的userId字段上 -->
+ <insert id="batchExperienceList" useGeneratedKeys="true" keyProperty="id">
+ insert into sys_experience
+ (
+ name,post,entryTime,cardId,companyname,securityId
+ )
+ values
+ <foreach collection="list" item="item" separator=",">
+ (
+ #{item.name},#{item.post},#{item.entrytime},#{item.cardid},#{item.companyname},#{item.securityid}
+ )
+ </foreach>
+ </insert>
+
</mapper>
--
Gitblit v1.9.3