From 0d99d26f39e055ee17fdbf2c5cbd1daf695c4310 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 13 Sep 2021 21:28:42 +0800
Subject: [PATCH] 报名新增，报名查询，报名清册，培训报名，培训报名查询修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 61 ++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 13 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 ca3b0e2..82fd6db 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -276,7 +276,7 @@
and bu.dept_id = #{user.deptId}
</if>
<if test="user.isApply!=null">
- and sa.is_apply = #{user.isApply}
+ and bu.is_apply = #{user.isApply}
</if>
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
@@ -298,17 +298,50 @@
<!--保安员列表树 安员列表树，帅选无保安证,下拉tree-->
+<!-- <select id="getSecurityApplyTree" resultType="org.springblade.modules.system.node.TreeNode">-->
+<!-- (-->
+<!-- select #{user.deptId} as id,-->
+<!-- bd2.dept_name as name,-->
+<!-- 0 as parentId-->
+<!-- from blade_user bu2-->
+<!-- left join-->
+<!-- blade_dept bd2-->
+<!-- on -->
+<!-- bu2.dept_id = bd2.id-->
+<!-- )-->
+
+<!-- union all-->
+
+<!-- (-->
+<!-- select-->
+<!-- distinct-->
+<!-- bu.id,-->
+<!-- bu.real_name as name,-->
+<!-- #{user.deptId} parentId-->
+<!-- from-->
+<!-- blade_user bu-->
+<!-- left join-->
+<!-- blade_dept bd-->
+<!-- on-->
+<!-- bu.dept_id = bd.id-->
+<!-- where-->
+<!-- bu.is_deleted = 0-->
+<!-- and bu.status = 1-->
+<!-- and bu.examination_type != 1-->
+<!-- and (hold = 2 or hold = 3)-->
+<!-- and bd.id = #{user.deptId}-->
+<!-- <if test="user.examType==1">-->
+<!-- and bu.is_apply != 1-->
+<!-- </if>-->
+<!-- <if test="user.examType==2">-->
+<!-- and bu.is_train != 1-->
+<!-- </if>-->
+<!-- )-->
+<!-- </select> -->
+
+
+ <!--保安员列表树 安员列表树，帅选无保安证,下拉tree-->
<select id="getSecurityApplyTree" resultType="org.springblade.modules.system.node.TreeNode">
- (
- select #{user.deptId} as id,
- '全部' as name,
- 0 as parentId
- from blade_user
- )
-
- union all
-
- (
select
distinct
bu.id,
@@ -332,7 +365,6 @@
<if test="user.examType==2">
and bu.is_train != 1
</if>
- )
</select>
@@ -397,6 +429,7 @@
<select id="getUserDetails" resultType="org.springblade.modules.system.vo.UserVO">
select
bu.*,
+ ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( cardid,7,4),0) age,
bd.dept_name deptName
from
blade_user bu
@@ -404,7 +437,9 @@
blade_dept bd
on
bu.dept_id = bd.id
- where bu.id = #{user.id}
+ where
+ 1=1
+ and bu.id = #{user.id}
</select>
<!--获取派遣信息-->
--
Gitblit v1.9.3