From d32fa50fca18a3fff89b9ec22deaa3d964ddd19b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 27 Jun 2018 12:34:27 +0800
Subject: [PATCH] 大屏布局监控点 返回配置数据

---
 src/main/resources/mapper/MonitorPointMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index ed57416..d1cbef7 100644
--- a/src/main/resources/mapper/MonitorPointMapper.xml
+++ b/src/main/resources/mapper/MonitorPointMapper.xml
@@ -19,6 +19,8 @@
 	  <result column="province_name" property="provinceName" jdbcType="VARCHAR" />
 	  <result column="city_name" property="cityName" jdbcType="VARCHAR" />
 	  <result column="area_name" property="areaName" jdbcType="VARCHAR" />
+	  <result column="town_name" property="townName" jdbcType="VARCHAR" />
+	  <result column="village_name" property="villageName" jdbcType="VARCHAR" />
     </association>
 	  <association property="organization" javaType="com.moral.entity.Organization">
 		  <result column="organization_id" property="id" jdbcType="INTEGER" />
@@ -59,7 +61,7 @@
 		address, is_delete, description
 	</sql>
 	<sql id="Relation_Province_City_Area_List">
-		are.area_name, cti.city_name, pro.province_name
+		are.area_name, cti.city_name, pro.province_name, t.town_name, v.village_name
 	</sql>
 	<select id="selectWithAreaNameByExample" parameterType="tk.mybatis.mapper.entity.Example" resultMap="BaseResultMap">
 		select
@@ -74,6 +76,8 @@
 		left join city cti on mpt.city_code = cti.city_code
 		left join province pro on mpt.province_code = pro.province_code
 		left join organization org on  mpt.organization_id = org.id
+		left join town t on mpt.town_code = t.town_code
+		left join village v on mpt.village_code = v.village_code
         where mpt.id in (
 		    select id from monitor_point
 			<if test="_parameter != null">

--
Gitblit v1.8.0