From 7342c944e24f884a2ef7826bd6c9e0442b06d2a7 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 01 Jun 2022 17:18:09 +0800
Subject: [PATCH] 农事操作新增农产品绑定，采收修改，农产品种植修改，新增根据地块查询农产品

---
 src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
index 3d7cc61..82199dc 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -4,13 +4,21 @@
 
     <!--自定义查询农产品库存分页数据-->
     <select id="selectFarmProductStockPage" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO">
-        select * from sys_farm_product_stock
+        select sfps.strain_id strainId,sum(sfps.weight) weight,ss.url,ss.strain_name strainName from sys_farm_product_stock sfps
+        left join sys_strain ss on ss.id = sfps.strain_id
         where 1=1
         <if test="farmProductStock.strainId!=null and farmProductStock.strainId!=''">
-            and strain_id = #{farmProductStock.strainId}
+            and sfps.strain_id = #{farmProductStock.strainId}
         </if>
         <if test="farmProductStock.leaves!=null and farmProductStock.leaves!=''">
-            and leaves = #{farmProductStock.leaves}
+            and sfps.leaves = #{farmProductStock.leaves}
         </if>
+        <if test="farmProductStock.startTime!=null and farmProductStock.startTime!=''">
+            and sfps.time &gt;= #{farmProductStock.startTime}
+        </if>
+        <if test="farmProductStock.endTime!=null and farmProductStock.endTime!=''">
+            and sfps.time &lt;= #{farmProductStock.endTime}
+        </if>
+        group by sfps.strain_id,ss.url,ss.strain_name
     </select>
 </mapper>

--
Gitblit v1.9.3