Merge remote-tracking branch 'origin/master'

fengxiang

2018-03-26 53d155ae4b7c4d5d7258c3d15cfff78ec41561f7

 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" />
@@ -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>