From 045b55722b25ccc77d88671c5d6df309edb8a66d Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 16:00:34 +0800
Subject: [PATCH] 1. 保安员新增异步推送数据至群访用户表 2. 会员标记接口新增,会员标记成功,则创建会员记录和会员题库记录(包含120道题目) 3. web 端考试开始,查询题目判断用户是否为会员,如果为会员则从会员题库获取当前人员的考试题目(从120道题中随机抽取60道)
---
src/main/java/org/springblade/modules/equipage/mapper/GunMapper.xml | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/mapper/GunMapper.xml b/src/main/java/org/springblade/modules/equipage/mapper/GunMapper.xml
index 9bbd43c..13363c9 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/GunMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/GunMapper.xml
@@ -5,17 +5,31 @@
<!--枪支分页信息-->
<select id="selectGunPage" resultType="org.springblade.modules.equipage.vo.GunVo">
SELECT
- sg.*,bt.tenant_name AS tenantName
+ sg.*,bt.dept_name AS tenantName
FROM
sys_gun sg
LEFT JOIN
- blade_tenant bt
+ blade_dept bt
ON
- sg.tenant_id = bt.tenant_id
+ sg.dept_id = bt.id
+ left join
+ sys_information si
+ on
+ si.departmentid = bt.id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
WHERE
1=1
+ <if test="gun.jurisdiction!=null and gun.jurisdiction!='' and gun.jurisdiction!='1372091709474910209'">
+ and (sj.id = #{gun.jurisdiction} or sj.parent_id = #{gun.jurisdiction})
+ </if>
<if test="gun.tenantName!=null and gun.tenantName!=''">
- and bt.tenant_name like concat('%', #{gun.tenantName},'%')
+ and bt.dept_name like concat('%', #{gun.tenantName},'%')
+ </if>
+ <if test="gun.deptId!=null and gun.deptId!=''">
+ and sg.dept_id = #{gun.deptId}
</if>
<if test="gun.gunCardNumber!=null and gun.gunCardNumber!=''">
and sg.gun_card_number like concat('%', #{gun.gunCardNumber},'%')
@@ -34,13 +48,13 @@
<!--枪支详情信息-->
<select id="selectGunInfo" resultType="org.springblade.modules.equipage.vo.GunVo">
SELECT
- sg.*,bt.tenant_name AS tenantName
+ sg.*,bt.dept_name AS tenantName
FROM
sys_gun sg
LEFT JOIN
- blade_tenant bt
+ blade_dept bt
ON
- sg.tenant_id = bt.tenant_id
+ sg.dept_id = bt.id
WHERE
1=1
<if test="gun.id!=null">
--
Gitblit v1.9.3