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/CarMapper.xml | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
index feba11b..95078b5 100644
--- a/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
+++ b/src/main/java/org/springblade/modules/equipage/mapper/CarMapper.xml
@@ -12,8 +12,19 @@
blade_dept bt
ON
sc.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="car.jurisdiction!=null and car.jurisdiction!='' and car.jurisdiction!='1372091709474910209'">
+ and (sj.id = #{car.jurisdiction} or sj.parent_id = #{car.jurisdiction})
+ </if>
<if test="car.tenantName!=null and car.tenantName!=''">
and bt.dept_name like concat('%', #{car.tenantName},'%')
</if>
@@ -56,4 +67,8 @@
and sc.id = #{car.id}
</if>
</select>
+
+ <select id="selectCar" resultType="java.util.HashMap">
+ SELECT equipment_code as code,car_number as carnumber FROM `sys_car` WHERE equipment_code IS NOT NULL
+ </select>
</mapper>
--
Gitblit v1.9.3