From 9742e7a70ac6e74d114e68ce1bc8f46670b55453 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 25 Jun 2018 16:39:48 +0800
Subject: [PATCH] 组织配置单位和页面布局
---
src/main/resources/mapper/MonitorPointMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/MonitorPointMapper.xml b/src/main/resources/mapper/MonitorPointMapper.xml
index 0660abd..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">
@@ -121,4 +125,10 @@
<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