From 6ee55849eac9cd9d9183d155e80ebd454115a0c3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 17 Aug 2021 10:28:11 +0800
Subject: [PATCH] 根据userID 查詢年齡，分數計算修改，年齡大於50岁的理论30%，实操70%，小于50岁的总分按理论实操各50%计算
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 90 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 89 insertions(+), 1 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 76d3e17..c148115 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -47,7 +47,8 @@
<result column="birthtime" property="birthtime"/>
</resultMap>
- <select id="selectUserPage" resultMap="userResultMap">
+ <!--带坐标-->
+ <select id="selectUserPages" resultMap="userResultMap">
select
bu.*,
sll.longitude,sll.latitude,
@@ -62,6 +63,10 @@
sys_live_location sll
on
sll.worker_id = bu.id
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
where
bu.is_deleted = 0
<if test="tenantId!=null and tenantId != ''">
@@ -82,6 +87,9 @@
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
</if>
+ <if test="user.roleAlias!=null and user.roleAlias != ''">
+ and (br.role_alias = '保安' or br.role_alias = '未持证保安')
+ </if>
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
</if>
@@ -97,6 +105,9 @@
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
</if>
+ <if test="user.examinationType!=null and user.examinationType != ''">
+ and bu.examination_type = #{user.examinationType}
+ </if>
<if test="deptIdList!=null and deptIdList.size>0">
and bu.id in (
SELECT
@@ -111,6 +122,59 @@
)
</if>
ORDER BY bu.id
+ </select>
+
+ <select id="selectUserPage" resultMap="userResultMap">
+ select * from blade_user where is_deleted = 0
+ <if test="user.tenantId!=null and user.tenantId != ''">
+ and tenant_id = #{user.tenantId}
+ </if>
+ <if test="user.account!=null and user.account != ''">
+ and account != #{user.account}
+ </if>
+ <if test="user.realName!=null and user.realName != ''">
+ and real_name like concat(concat('%', #{user.realName}),'%')
+ </if>
+ <if test="user.deptId!=null and user.deptId != ''">
+ and dept_id like concat(concat('%', #{user.deptId}),'%')
+ </if>
+ <if test="user.userType!=null and user.userType != ''">
+ and user_type = #{user.userType}
+ </if>
+ <if test="user.nativeplace!=null and user.nativeplace != ''">
+ and nativeplace = #{user.nativeplace}
+ </if>
+ <if test="user.sex!=null and user.sex != ''">
+ and sex = #{user.sex}
+ </if>
+ <if test="user.status!=null and user.status != ''">
+ and status = #{user.status}
+ </if>
+ <if test="user.hold!=null and user.hold != ''">
+ and hold = #{user.hold}
+ </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ and jurisdiction = #{user.jurisdiction}
+ </if>
+ <if test="user.securitynumber!=null and user.securitynumber != ''">
+ and securitynumber = #{user.securitynumber}
+ </if>
+ <if test="user.examinationType!=null and user.examinationType != ''">
+ and examination_type = #{user.examinationType}
+ </if>
+ <if test="deptIdList!=null and deptIdList.size>0">
+ and id in (
+ SELECT
+ user_id
+ FROM
+ blade_user_dept
+ WHERE
+ dept_id IN
+ <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ )
+ </if>
+ ORDER BY id
</select>
<select id="getUser" resultMap="userResultMap">
@@ -144,6 +208,8 @@
FROM blade_user
where cardid = #{param1}
</select>
+
+
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMap">
select
@@ -310,4 +376,26 @@
select count(*) from blade_user
where securitynumber like concat('%', #{pre},'%')
</select>
+
+ <!--查询当前公司未持证保安没有报名的人员-->
+ <select id="getNotApplyIdList" resultType="org.springblade.modules.system.entity.User">
+ select DISTINCT
+ bu.id,is_apply isApply
+ from
+ blade_user bu
+ left join
+ sys_apply sa
+ on
+ sa.user_id = bu.id
+ where 1=1
+ and (hold=2 or hold = 3)
+ and (bu.is_apply != 1 or bu.is_apply is null)
+ and (sa.apply_status !=2 or sa.apply_status is null)
+ and bu.dept_id = #{deptId}
+ </select>
+
+ <!--计算保安人员年龄-->
+ <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>
</mapper>
--
Gitblit v1.9.3