From 44164c75df0b09133f1a001d38a41c408666b307 Mon Sep 17 00:00:00 2001
From: xufenglei <xufenglei>
Date: Tue, 12 Jun 2018 08:48:05 +0800
Subject: [PATCH] 镇村 选项

---
 src/main/resources/mapper/HistoryMinutelyMapper.xml |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/HistoryMinutelyMapper.xml b/src/main/resources/mapper/HistoryMinutelyMapper.xml
index 1ba659a..d9c4cd8 100644
--- a/src/main/resources/mapper/HistoryMinutelyMapper.xml
+++ b/src/main/resources/mapper/HistoryMinutelyMapper.xml
@@ -13,7 +13,20 @@
 		FROM
 			history_minutely
 		WHERE
-			mac = #{mac}
+			mac IN
+				(SELECT
+					d.mac 
+				FROM
+					device d
+				WHERE
+					d.is_delete = 0 
+					<if test="monitorPointId != null">
+					AND d.monitor_point_id = #{monitorPointId}
+					</if>
+					<if test="mac != null">
+					AND d.mac = #{mac}
+					</if>
+				)	
 		AND time >= #{start}
 		AND time &lt; #{end}
 	</select>
@@ -96,6 +109,9 @@
 					 <if test='"DEVICE"==dataCondition.areaRange.toString()'>
 						and dev.id = #{dataCondition.areaRangeId}
 					 </if>
+					<if test='"PROFESSION"==dataCondition.deviceDimension.toString()'>
+						and dev.profession_id = #{dataCondition.dimensionValue}
+					</if>
 					<if test='"MONITORPOINT"==dataCondition.areaRange.toString()'>
 						and mpt.id = #{dataCondition.areaRangeId}
 					</if>

--
Gitblit v1.8.0