From 680b380e3d9189f2bfd79fb33a6428d82219e4bc Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 17 Sep 2022 10:29:44 +0800
Subject: [PATCH] 新增加工产品出库,修改加工产品数据存储逻辑

---
 src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 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 85b4538..b5ab481 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -75,7 +75,7 @@
                  ss.url,
                  ss.strain_name,
                  sfps.land_id
-            ) a GROUP BY strainId
+            ) a WHERE weight !=0 GROUP BY strainId
     </select>
 
     <select id="selectFarmProductStockPages" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO">
@@ -358,7 +358,7 @@
         left join sys_land sl on sr.land_id = sl.id
         WHERE 1 = 1
         <if test="year!=null and year!=''">
-            and YEAR ( sr.time ) = #{year}
+            and sr.time like concat('%',#{year},'%')
         </if>
         <if test="farmId!=null and farmId!=''">
             and sl.farm_id = #{farmId}

--
Gitblit v1.9.3