From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 0222fc2..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,13 +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=#{departmentid}
+ and departmentid=#{information.departmentid}
</if>
</select>
@@ -121,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,
@@ -172,20 +177,13 @@
blade_dept bd
on
si.departmentid = bd.id
- left join
- sys_train_exam ste
- on
- ste.dept_id = bd.id
where 1=1
- and ste.audit_status = 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.stats!=null and information.stats!=''">
- and stats=#{stats}
</if>
<if test="information.jurisdiction!=null and information.jurisdiction!=''">
and si.jurisdiction=#{jurisdiction}
--
Gitblit v1.9.3