From 61e8c756cc2a9e503d643672f103c3837fadc1d4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 21:27:28 +0800
Subject: [PATCH] 保安员，保安公司查询修改
---
src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml | 4 ++--
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 13 +++++++------
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 6 ++++--
src/main/java/org/springblade/modules/system/controller/UserController.java | 2 +-
4 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
index 8a94db8..874d340 100644
--- a/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
+++ b/src/main/java/org/springblade/modules/apply/mapper/ApplyMapper.xml
@@ -8,7 +8,7 @@
sa.id,sa.apply_status applyStatus,sa.user_id userId,sa.candidate_no candidateNo,apply_time,exam_id examId,
sa.examination_type examinationType,sa.examination_mx examinationMx,
ke.total_score paperScore,ke.exam_type examType,ke.start_time examTime,ke.exam_name examName,
- bu.real_name realName,bu.is_apply isApply, TIMESTAMPDIFF(YEAR, bu.birthday, CURDATE()) age,
+ bu.real_name realName,bu.is_apply isApply, ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(bu.cardid,7,4),0) age,
bd.dept_name deptName,bu.cardid idCardNo,"保安证" applyCard
FROM
sys_apply sa
@@ -42,7 +42,7 @@
and sa.examination_type = #{apply.examinationType}
</if>
<if test="apply.applyStatus!=null">
- and apply_status = #{apply.applyStatus}
+ and sa.exam_id is null
</if>
<if test="apply.applyExamType!=null">
and apply_exam_type = #{apply.applyExamType}
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index f9cd245..3c276f2 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -351,7 +351,7 @@
}
/**
- * 导入用户
+ * 导入用户page-security-apply
*/
@PostMapping("import-user")
@ApiOperationSupport(order = 12)
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index 2a06a19..af6b05a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -104,6 +104,7 @@
<select id="securityLazyTree" resultMap="treeNodeResultMap" >
SELECT
+ DISTINCT
dept.id,
dept.parent_id,
dept.dept_name AS title,
@@ -125,12 +126,13 @@
si.departmentid = dept.id
WHERE
1=1
- and (stats = 1 or stats =2 or stats =4)
+ and dept_category = 1
AND dept.is_deleted = 0
+ and dept.id !=1420222961377357825
+ and dept.parent_id!=1420222961377357825
<if test="param1!=null and param1!='' and param1!='1123598813738675201'">
and si.jurisdiction = #{param1}
</if>
- ORDER BY dept.sort
</select>
<!--懒加载获取部门树形结构(按分类查询)-->
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 d61feb3..d8a3b6e 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -213,10 +213,14 @@
blade_dept bd
on
bu.dept_id = bd.id
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
where
bu.is_deleted = 0
- and
- bd.dept_category = 1
+ and bd.dept_category = 1
+ and role_alias = '保安'
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
</if>
@@ -242,9 +246,6 @@
</if>
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
- </if>
- <if test="user.hold!=null and user.hold != ''">
- and bu.hold = #{user.hold}
</if>
<if test="user.jurisdiction!=null and user.jurisdiction != ''">
and bu.jurisdiction = #{user.jurisdiction}
@@ -369,7 +370,7 @@
bu.id,
bu.avatar,
bu.securitynumber securityNumber,
- ifnull(TIMESTAMPDIFF(YEAR, bu.birthday, CURDATE()),0) age,
+ ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( cardid,7,4),0) age,
bu.real_name realName,
bu.sex,
bd.dept_name deptName
--
Gitblit v1.9.3