From 6f7fd53b38334de7bf22618fb79a528103f5954c Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 May 2022 14:02:34 +0800
Subject: [PATCH] 农产品库存查询修改，新增农产品操作统计

---
 src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 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 f9cb835..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,7 +4,7 @@
 
     <!--自定义查询农产品库存分页数据-->
     <select id="selectFarmProductStockPage" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO">
-        select sfps.*,ss.url,ss.strain_name strainName from sys_farm_product_stock sfps
+        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!=''">
@@ -13,5 +13,12 @@
         <if test="farmProductStock.leaves!=null and 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