From fdff4ca4813fc77a9006309ed4e5c232b4f3c85e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 22 Jul 2022 14:26:51 +0800
Subject: [PATCH] 返回数据新增农场全景地址

---
 src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
index a54cc03..ff3e375 100644
--- a/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
+++ b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
@@ -22,12 +22,19 @@
 
 
     <select id="selectProcessPage" resultMap="processResultMap">
-        SELECT p.*,
-               m.machining_type as processName,
-               m.machining_tp   AS tpurl
+        SELECT p.strain_id,
+        p.land_id,
+        SUM(p.process_num) as process_num,
+        m.machining_type AS processName,
+        m.machining_tp AS tpurl
         FROM sys_process p
-                 LEFT JOIN sys_machining m ON m.id = p.process_id
+        LEFT JOIN sys_machining m ON m.id = p.process_id
+        LEFT JOIN sys_land sl ON sl.id = p.land_id
         WHERE p.is_deleted = 0
+        <if test="process.farmId!=null and process.farmId!=''">
+            and sl.farm_id = #{process.farmId}
+        </if>
+        GROUP BY p.strain_id,m.machining_type,m.machining_tp,p.land_id
     </select>
 
 </mapper>

--
Gitblit v1.9.3