From 465d1f03afa058d9ce210f2fc48e5c06ce291a68 Mon Sep 17 00:00:00 2001
From: fengxiang <fengxiang@blit.7drlb>
Date: Tue, 31 Oct 2017 16:00:44 +0800
Subject: [PATCH] 手机api

---
 src/main/resources/mapper/EquipmentMapper.xml |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/EquipmentMapper.xml b/src/main/resources/mapper/EquipmentMapper.xml
index 1839acb..b461129 100644
--- a/src/main/resources/mapper/EquipmentMapper.xml
+++ b/src/main/resources/mapper/EquipmentMapper.xml
@@ -17,6 +17,19 @@
     <result column="area" jdbcType="VARCHAR" property="area" />
     <result column="monitorpoint" jdbcType="VARCHAR" property="monitorpoint" />
     <result column="owner_id" jdbcType="VARCHAR" property="ownerId" />
+            <!-- ������������������������������ -->
+        <association property="monitorpointDetail" javaType="com.moral.monitor.entity.MonitorPoint">
+        	   <result column="monitorpoint" property="id" jdbcType="VARCHAR" />
+               <result column="mpt_name" property="name" jdbcType="VARCHAR" />
+        </association>
+		<association property="ownerDetail" javaType="com.moral.monitor.entity.Organization">
+				<result column="owner_id" property="id" jdbcType="VARCHAR" />
+				<result column="org_name" property="name" jdbcType="VARCHAR" />
+		</association>
+		<association property="installerDetail" javaType="com.moral.monitor.entity.User">
+				<result column="installer" property="id" jdbcType="VARCHAR" />
+				<result column="user_name" property="name" jdbcType="VARCHAR" />
+		</association>
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -85,8 +98,14 @@
     <if test="distinct">
       distinct
     </if>
-    <include refid="Base_Column_List" />
+    equipment.*,
+    mpt.name as mpt_name,
+    org.name as org_name,
+    user.name as user_name
     from equipment
+    LEFT JOIN monitorpoint mpt on equipment.monitorpoint = mpt.id
+    LEFT JOIN organization org on equipment.owner_id = org.id
+    LEFT JOIN user on equipment.installer = user.id
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
     </if>

--
Gitblit v1.8.0