From 2ac80d588a68f60084d8bcc02aabd18c91100267 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 29 May 2018 14:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/MonitorPointMapper.xml | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index 5e6b2a4..ed57416 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -113,9 +113,18 @@
AND mpt.latitude < #{mapBounds.Fe,jdbcType=NUMERIC}
AND mpt.latitude > #{mapBounds.Ke,jdbcType=NUMERIC}
]]>
+ <if test="isDelete != null">
+ AND mpt.is_delete = #{isDelete,jdbcType=VARCHAR}
+ </if>
</where>
</select>
<select id="selectOrganizationIds" parameterType="integer" resultType="integer">
call proc_organizationIds_GetByMonitorPointId(#{id,jdbcType=NUMERIC})
</select>
+ <select id="selectVersionsById" parameterType="integer" resultType="integer">
+ select version from device_version dve
+ right join device dev on dve.id = dev.device_version_id
+ right join monitor_point mpt on mpt.id = dev.monitor_point_id
+ where mpt.id = #{id} ORDER BY version DESC
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0