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 |   12 +++++++++++-
 1 files changed, 11 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 e5c50d2..c148115 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -105,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
@@ -154,6 +157,9 @@
     </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 (
@@ -383,9 +389,13 @@
         sa.user_id = bu.id
         where 1=1
 		and (hold=2 or hold = 3)
-        and (sa.is_exam != 1 or sa.is_exam is null)
         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