From 6bd7ffcfcb0b5fb8dd1a5e95e78b07d9bb161f19 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 19 Aug 2021 12:06:15 +0800
Subject: [PATCH] 1.用户注册接口修改 2.保安公司列表查询接口修改
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
index 6d579bc..d95b7fb 100644
--- a/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
+++ b/src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -24,6 +24,9 @@
<result column="departmentid" property="departmentid"/>
<result column="stats" property="stats"/>
<result column="jurisdiction" property="jurisdiction"/>
+ <result column="representativecell" property="representativecell"/>
+ <result column="contacts" property="contacts"/>
+ <result column="contactscell" property="contactscell"/>
</resultMap>
@@ -36,10 +39,13 @@
and representative like concat(concat('%', #{information.representative}),'%')
</if>
<if test="information.stats!=null and information.stats!=''">
- and stats=#{stats}
+ and stats=#{information.stats}
</if>
- <if test="information.jurisdiction!=null and information.jurisdiction!=''">
- and jurisdiction=#{jurisdiction}
+ <if test="information.jurisdiction!=null and information.jurisdiction!='' and information.jurisdiction!='1123598813738675201'">
+ and jurisdiction=#{information.jurisdiction}
+ </if>
+ <if test="information.departmentid!=null and information.departmentid!=''">
+ and departmentid=#{information.departmentid}
</if>
</select>
@@ -118,6 +124,8 @@
) B ON A.dept_id = B.dept_id
WHERE A.dept_id = #{deptid}
</select>
+
+
<!--保安员持证和未持证数量-->
<select id="selectHold" resultType="java.util.HashMap">
SELECT IFNULL(A.thisnum, 0) AS cz,
@@ -158,4 +166,32 @@
LEFT JOIN (SELECT COUNT(*) AS numz, dept_id FROM blade_user GROUP BY dept_id) B ON A.deptid = B.dept_id
WHERE A.deptid = #{deptid}
</select>
+
+ <!--查询培训单位信息(可以报名)-->
+ <select id="securityPage" resultType="org.springblade.modules.information.vo.InformationVO">
+ select
+ si.*,bd.dept_name deptName
+ from
+ sys_information si
+ left join
+ blade_dept bd
+ on
+ si.departmentid = bd.id
+ where 1=1
+ and bd.dept_category = 3
+ <if test="information.deptName!=null and information.deptName!=''">
+ and bd.dept_name like concat(concat('%', #{information.deptName}),'%')
+ </if>
+ <if test="information.representative!=null and information.representative!=''">
+ and representative like concat(concat('%', #{information.representative}),'%')
+ </if>
+ <if test="information.jurisdiction!=null and information.jurisdiction!=''">
+ and si.jurisdiction=#{jurisdiction}
+ </if>
+ <if test="information.departmentid!=null and information.departmentid!=''">
+ and departmentid=#{departmentid}
+ </if>
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3