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/seinspect/mapper/SeinspectMapper.xml | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml b/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
index a982e01..6dc19ae 100644
--- a/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
+++ b/src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
@@ -23,10 +23,11 @@
<select id="selectSeinspectPage" resultType="org.springblade.modules.seinspect.vo.SeinspectVO">
select
- ss.*,
+ ss.*,bu1.cardid cardId,
bu.real_name realName,
bd.dept_name examinerDeptName,
- bu1.real_name securityName
+ bu1.real_name securityName,
+ bd1.dept_name securityDeptName
from
sys_seinspect ss
left join
@@ -41,18 +42,22 @@
blade_user bu1
on
bu1.id = ss.security_id
+ left join
+ blade_dept bd1
+ on
+ bd1.id = bu1.dept_id
where 1 = 1
<if test="seinspect.realName!=null and seinspect.realName!=''">
- bu.real_name like concat('%',#{seinspect.realName},'%')
+ and bu.real_name like concat('%',#{seinspect.realName},'%')
</if>
<if test="seinspect.examinerDeptName!=null and seinspect.examinerDeptName!=''">
- bd.dept_name like concat('%',#{seinspect.examinerDeptName},'%')
+ and bd.dept_name like concat('%',#{seinspect.examinerDeptName},'%')
</if>
<if test="seinspect.securityName!=null and seinspect.securityName!=''">
- bu1.real_name like concat('%',#{seinspect.securityName},'%')
+ and bu1.real_name like concat('%',#{seinspect.securityName},'%')
</if>
<if test="seinspect.result!=null and seinspect.result!=''">
- ss.result like concat('%',#{seinspect.result},'%')
+ and ss.result like concat('%',#{seinspect.result},'%')
</if>
</select>
--
Gitblit v1.9.3