From 6f08c72b1056c9e4b2bdf79bafbc49fcc3cdcaa1 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Sun, 08 Apr 2018 11:24:56 +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 1bbef74..0ce62ba 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -194,7 +194,7 @@
 	</resultMap>
 	<!-- resultMap������ -->
 	<select id="selectOrganizationIds" resultType="INTEGER">
-		call proc_organization_id_select(#{id,jdbcType=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="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