From 51f3652b96a09c150554ff8cbca7585e932235cd Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 25 Apr 2018 16:43:31 +0800
Subject: [PATCH] 微信页面详情 完善

---
 src/main/resources/mapper/DeviceMapper.xml |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 846ad57..c13c908 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -193,7 +193,7 @@
 		<collection property="organizationIds" column="id" select="selectOrganizationIds"></collection>
 	</resultMap>
 	<!-- resultMap������ -->
-	<select id="selectOrganizationIds" resultType="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">
@@ -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