From af01675778013c044754d6bded36ba3cd65d36d1 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Fri, 26 Aug 2022 10:17:12 +0800
Subject: [PATCH] 大屏地块查询返回种养品种图片

---
 src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml |   30 ++++++++++++++++++------------
 1 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
index 2f5c3ad..62ee517 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -69,19 +69,24 @@
     </select>
 
     <!--查询地块列表(不分页)-->
-    <select id="getLandList" resultType="org.springblade.modules.lang.vo.LandVO">
+    <select id="getLandList"  resultMap="landResultMap">
         SELECT
-        id,
-        land_name,
-        land_area,
-        ST_ASTEXT(land_range) as land_range,
-        url,
-        type,
-        land_type,
-        land_unit,
-        dept_id,
-        farm_id
-        FROM sys_land
+        l.id,
+        l.land_name,
+        l.land_area,
+        ST_ASTEXT(l.land_range) as land_range,
+        l.url,
+        l.type,
+        l.land_type,
+        l.land_unit,
+        l.dept_id,
+        l.farm_id,
+        GROUP_CONCAT(a.url) AS strainUrl
+        FROM sys_land l
+        LEFT JOIN
+        (
+        SELECT sfp.strain_id,strain.url,sfp.land_id FROM sys_farm_plant sfp LEFT JOIN sys_strain strain ON strain.id = sfp.strain_id WHERE sfp.`status` = 1
+        ) a ON l.id = a.land_id
         where is_deleted = 0
         <if test="land.landType!=null and land.landType != ''">
             and land_type = #{land.landType}
@@ -101,6 +106,7 @@
         <if test="land.farmId!=null and land.farmId != ''">
             and farm_id =#{land.farmId}
         </if>
+        GROUP BY l.id
     </select>
 
     <insert id="saveLandInfo">

--
Gitblit v1.9.3