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/sale/mapper/SaleMapper.xml | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
index e30f44e..6f97f7c 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -89,6 +89,12 @@
<if test="sale.farmId != null and sale.farmId !=''">
AND (land.farm_id = #{sale.farmId} OR inv.fps_id = #{sale.farmId})
</if>
+ <if test="sale.type != null and sale.type !='' ">
+ AND sale.type = #{sale.type}
+ </if>
+ <if test="sale.kind != null and sale.kind !='' ">
+ AND (inv.product_id = #{sale.kind} OR sale.strain_id = #{sale.kind})
+ </if>
AND sale.is_deleted = 0
ORDER BY
sale.create_time DESC
@@ -173,6 +179,7 @@
sys_sale sale
LEFT JOIN sys_district dis ON sale.sale_destination = dis.CODE
LEFT JOIN sys_land sl ON sl.id = sale.land_id
+ LEFT JOIN sys_process_inv inv ON inv.id = sale.prod_id
WHERE 1 = 1 AND sale.is_deleted = 0
<if test="startTime != null and startTime != ''">
and sale_time >= #{startTime}
@@ -183,9 +190,8 @@
<if test="startTime == null and endTime == null ">
and YEAR ( sale_time ) = YEAR ( NOW( ) )
</if>
-
<if test="farmId != null and farmId != ''">
- and sl.farm_id = #{farmId}
+ and (sl.farm_id = #{farmId} or inv.fps_id = #{farmId})
</if>
GROUP BY
dis.NAME,
--
Gitblit v1.9.3