From 38210e26e25db5509e4c839977b51b5c6374c707 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 01 Aug 2022 14:27:20 +0800
Subject: [PATCH] 加工列表显示

---
 src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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 ff3e375..44033ac 100644
--- a/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
+++ b/src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml
@@ -13,6 +13,7 @@
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="strain_id" property="strainId"/>
+        <result column="strain_name" property="strainName"/>
         <result column="sale_time" property="saleTime"/>
         <result column="sale_num" property="saleNum"/>
         <result column="process_id" property="processId"/>
@@ -23,18 +24,22 @@
 
     <select id="selectProcessPage" resultMap="processResultMap">
         SELECT p.strain_id,
-        p.land_id,
+        p.land_id,sale_time,sale_num,strain_name,process_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_land sl ON sl.id = p.land_id
+        LEFT JOIN sys_strain strain ON p.strain_id = strain.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
+        <if test="process.strainId !=null and process.strainId !=''">
+            and p.strain_id = #{process.strainId}
+        </if>
+        GROUP BY p.strain_id,m.machining_type,m.machining_tp,p.land_id,sale_time,sale_num,process_id
     </select>
 
 </mapper>

--
Gitblit v1.9.3