From 497df0adf57c8a076596fa763cdbe5a554b96b5b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 25 Dec 2021 18:39:46 +0800
Subject: [PATCH] 新增分公司的总公司工商信息管理
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 109 insertions(+), 4 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 3adc6b5..b17eb39 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -142,7 +142,24 @@
and bu.real_name like concat('%', #{user.realName},'%')
</if>
<if test="user.dispatch!=null and user.dispatch != ''">
- and bu.dispatch = #{user.dispatch}
+ <if test="user.dispatch == 0">
+ and bu.dispatch = #{user.dispatch}
+ </if>
+ <if test="user.dispatch == 1">
+ 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}
@@ -153,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">
@@ -454,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
@@ -682,6 +704,7 @@
<!--导出保安员信息-->
<select id="exportSecurityInfo" resultType="org.springblade.modules.system.excel.SecurityExcel">
select
+ distinct bu.id,
bd.dept_name deptId,
bu.real_name realName,
bu.phone,
@@ -722,6 +745,18 @@
<if test="user.examinationType == 1">
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},'%')
@@ -772,7 +807,12 @@
and bu.real_name like concat('%', #{user.realName},'%')
</if>
<if test="user.dispatch!=null and user.dispatch != ''">
- and bu.dispatch = #{user.dispatch}
+ <if test="user.dispatch == 0">
+ and bu.dispatch = #{user.dispatch}
+ </if>
+ <if test="user.dispatch == 1">
+ and bu.dispatch = #{user.dispatch}
+ </if>
</if>
<if test="user.userType!=null and user.userType != ''">
and bu.user_type = #{user.userType}
@@ -786,6 +826,71 @@
ORDER BY bu.id desc
</select>
+ <!--查询押运人员编码不为null的保安信息-->
+ <select id="selectEquipent" resultType="java.util.HashMap">
+ SELECT id,
+ equipment_code as code
+ FROM blade_user
+ WHERE dept_id = '1460129345988239362'
+ AND role_id = '1412226235153731586'
+ AND is_deleted = 0
+ AND `status` = 1
+ AND equipment_code IS NOT NULL
+ </select>
+ <!--查詢用戶派遣記錄信息-->
+ <select id="getUserDispatcherInfo" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
+ select
+ sdu.name dispatcherCompany,
+ dispatcherTime dispatchertime,
+ sd.end_time endTime
+ from blade_user bu
+ left join
+ sys_dispatcher sd
+ on
+ sd.user_ids = bu.id
+ left join
+ sys_dispatcher_unit sdu
+ on
+ sdu.id = sd.dispatcher_unit_id
+ where 1=1
+ and sd.status = 0
+ 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