From d5d18e36e370b804f6e5f352e75fe3a2b3ae9610 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 25 Apr 2018 13:58:56 +0800
Subject: [PATCH] 微信报警详情页bug修复
---
src/main/resources/mapper/DeviceMapper.xml | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 1bbef74..c13c908 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -193,8 +193,8 @@
<collection property="organizationIds" column="id" select="selectOrganizationIds"></collection>
</resultMap>
<!-- resultMap������ -->
- <select id="selectOrganizationIds" resultType="INTEGER">
- call proc_organization_id_select(#{id,jdbcType=INTEGER});
+ <select id="selectOrganizationIds" resultType="java.lang.Integer">
+ call proc_organizationIds_GetByDeviceId(#{id,jdbcType=INTEGER});
</select>
<select id="selectWithOrgIdsByMac" parameterType="java.lang.String" resultMap="BaseResultWithOrgIdsMap">
select
@@ -202,4 +202,30 @@
from device
where mac = #{mac,jdbcType=VARCHAR}
</select>
+
+ <select id="getDeviceCountByRegion" resultType="java.lang.Integer">
+ SELECT
+ COUNT( * )
+ FROM
+ device d
+ WHERE
+ d.is_delete = 0
+ AND d.monitor_point_id IN (
+ SELECT
+ mp.id
+ FROM
+ monitor_point mp
+ WHERE
+ mp.is_delete = 0
+ <if test="provinceCode != null">
+ AND mp.province_code = #{provinceCode}
+ </if>
+ <if test="cityCode != null">
+ AND mp.city_code = #{cityCode}
+ </if>
+ <if test="areaCode != null">
+ AND mp.area_code = #{areaCode}
+ </if>
+ )
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0