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/revoke/mapper/RevokeMapper.xml | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml b/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
index 0fa164b..10d37b7 100644
--- a/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
+++ b/src/main/java/org/springblade/modules/revoke/mapper/RevokeMapper.xml
@@ -32,13 +32,32 @@
<result column="storage" property="storage"/>
<result column="approve" property="approve"/>
<result column="jurisdiction" property="jurisdiction"/>
+ <result column="overtime" property="overtime"/>
</resultMap>
<select id="selectRevokePage" resultMap="revokeResultMap">
- select * from sys_revoke
+ select * from sys_revoke si left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction where 1=1
+ <if test="revoke.ptype!=null and revoke.ptype!=''">
+ and ptype=#{revoke.ptype}
+ </if>
+ <if test="revoke.jurisdiction!=null and revoke.jurisdiction != '' and revoke.jurisdiction!='1372091709474910209'">
+ and (sj.id = #{revoke.jurisdiction} or sj.parent_id = #{revoke.jurisdiction})
+ </if>
+ <!-- <if test="revoke.usetype=='1'.toString()">-->
+ <!-- and jurisdiction in(${jurisdiction})-->
+ <!-- </if>-->
+ <!-- <if test="revoke.usetype=='2'.toString()">-->
+ <!-- and jurisdiction=#{revoke.jurisdiction}-->
+ <!-- </if>-->
</select>
<select id="selectIn" resultType="java.util.HashMap">
- select * from sys_revoke where cardid=#{cardid} and ptype=#{type}
+ select *
+ from sys_revoke
+ where cardid = #{cardid}
+ and ptype = #{type}
</select>
</mapper>
--
Gitblit v1.9.3