From 72b971c98c46531064d74b68fc8fe8864ed0b544 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 08 Nov 2022 09:04:56 +0800
Subject: [PATCH] 大屏溯源统计次数sql修改
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 6fd13c1..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}
@@ -387,9 +387,10 @@
<!--小程序农产品库存详情数据-->
<select id="statisticsProductx" resultType="org.springblade.modules.farmplant.vo.FarmProductStockVO">
- select sfps.strain_id strainId,sfps.weight,ss.url,ss.strain_name strainName from
+ select sfps.strain_id strainId,SUM(sfps.weight) AS weight,ss.url,ss.strain_name strainName from
sys_farm_product_stock sfps
left join sys_strain ss on ss.id = sfps.strain_id
+ LEFT JOIN sys_land land ON land.id = sfps.land_id
where 1=1
<if test="farmProductStock.strainId!=null and farmProductStock.strainId!=''">
and sfps.strain_id = #{farmProductStock.strainId}
@@ -412,6 +413,10 @@
<if test="farmProductStock.strainType !=null and farmProductStock.strainType !='' ">
and ss.strain_type = #{farmProductStock.strainType}
</if>
+ <if test="farmProductStock.farmId !=null and farmProductStock.farmId !='' ">
+ and land.farm_id = #{farmProductStock.farmId}
+ </if>
+ GROUP BY sfps.strain_id
</select>
<!--销售对比库存是否充足-->
@@ -419,7 +424,7 @@
SELECT
CASE
WHEN
- weight > #{sale} THEN
+ weight >= #{sale} THEN
TRUE ELSE FALSE
END result
FROM
--
Gitblit v1.9.3