From 879fe6b588b87e4266abf3cfbafba406fd06c34c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 22 Jul 2022 09:51:20 +0800
Subject: [PATCH] 全景表添加农场id，一个农场对应一个全景
---
src/main/java/org/springblade/modules/panorama/mapper/PanoramaMapper.xml | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/panorama/mapper/PanoramaMapper.xml b/src/main/java/org/springblade/modules/panorama/mapper/PanoramaMapper.xml
index 9725c46..fc2f7c2 100644
--- a/src/main/java/org/springblade/modules/panorama/mapper/PanoramaMapper.xml
+++ b/src/main/java/org/springblade/modules/panorama/mapper/PanoramaMapper.xml
@@ -3,7 +3,7 @@
<mapper namespace="org.springblade.modules.panorama.mapper.PanoramaMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="panoramaResultMap" type="org.springblade.modules.panorama.entity.Panorama">
+ <resultMap id="panoramaResultMap" type="org.springblade.modules.panorama.vo.PanoramaVO">
<result column="id" property="id"/>
<result column="create_user" property="createUser"/>
<result column="create_dept" property="createDept"/>
@@ -17,11 +17,20 @@
<result column="jd" property="jd"/>
<result column="wd" property="wd"/>
<result column="address_name" property="addressName"/>
+ <result column="farm_name" property="farmName"/>
+ <result column="farm_id" property="farmId"/>
</resultMap>
<select id="selectPanoramaPage" resultMap="panoramaResultMap">
- select * from sys_panorama where is_deleted = 0
+ select panorama.*,farm.farm_name
+ from sys_panorama panorama
+ LEFT JOIN sys_farm farm ON panorama.farm_id = farm.id
+ where is_deleted = 0
+ </select>
+
+ <select id="getFarmList" resultType="org.springblade.modules.panorama.entity.Panorama">
+ select * from sys_panorama where farm_id = #{farmId}
</select>
</mapper>
--
Gitblit v1.9.3