From 53d155ae4b7c4d5d7258c3d15cfff78ec41561f7 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 26 Mar 2018 14:13:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/MonitorPointMapper.xml | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index bf0a5ee..5e6b2a4 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -13,6 +13,7 @@
<result column="address" jdbcType="VARCHAR" property="address" />
<result column="is_delete" jdbcType="CHAR" property="isDelete" />
<result column="description" jdbcType="VARCHAR" property="description" />
+ <result column="state" jdbcType="INTEGER" property="state" />
<!-- ������������������������������ -->
<association property="areaNames" javaType="com.moral.entity.AreaNames">
<result column="province_name" property="provinceName" jdbcType="VARCHAR" />
@@ -20,7 +21,7 @@
<result column="area_name" property="areaName" jdbcType="VARCHAR" />
</association>
<association property="organization" javaType="com.moral.entity.Organization">
- <result column="organization_id" property="id" jdbcType="VARCHAR" />
+ <result column="organization_id" property="id" jdbcType="INTEGER" />
<result column="organization_name" property="name" jdbcType="VARCHAR" />
</association>
</resultMap>
@@ -100,4 +101,21 @@
AND mp.city_code = c.city_code
</if>
</select>
+ <select id="selectByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
+ SELECT mpt.* from monitor_point mpt
+ <where>
+ <if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
+ mpt.organization_id = #{orgId,jdbcType=VARCHAR}
+ </if>
+ <![CDATA[
+ AND mpt.longitude < #{mapBounds.Ge,jdbcType=NUMERIC}
+ AND mpt.longitude > #{mapBounds.Le,jdbcType=NUMERIC}
+ AND mpt.latitude < #{mapBounds.Fe,jdbcType=NUMERIC}
+ AND mpt.latitude > #{mapBounds.Ke,jdbcType=NUMERIC}
+ ]]>
+ </where>
+ </select>
+ <select id="selectOrganizationIds" parameterType="integer" resultType="integer">
+ call proc_organizationIds_GetByMonitorPointId(#{id,jdbcType=NUMERIC})
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0