From d16174bd73148a2963f495a24ef97a40e62b4169 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Mon, 01 Aug 2022 15:21:11 +0800
Subject: [PATCH] 添加农资使用记录
---
src/main/java/org/springblade/modules/process/mapper/ProcessMapper.xml | 12 ++++++++++--
1 files changed, 10 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 374bda2..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"/>
@@ -22,16 +23,23 @@
<select id="selectProcessPage" resultMap="processResultMap">
- SELECT p.*,
- m.machining_type as processName,
+ SELECT p.strain_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>
+ <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