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/retrieval/mapper/RetrievalMapper.xml | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
index 10be15e..0acac46 100644
--- a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
+++ b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
@@ -52,19 +52,25 @@
SELECT
retrieval.*,
strain.strain_name,
+ mach.machining_type AS proName,
bdb.dict_value AS reDestination
FROM
sys_retrieval retrieval
LEFT JOIN sys_strain strain ON strain.id = retrieval.strain_id
LEFT JOIN blade_dict_biz bdb ON bdb.dict_key = retrieval.sale_destination1
LEFT JOIN sys_land land ON land.id = retrieval.land_id
+ LEFT JOIN sys_process_inv inv ON inv.id = retrieval.prod_id
+ LEFT JOIN sys_machining mach ON mach.id = inv.product_id
WHERE
bdb.code = "reDestination"
- <if test="retrieval.strainId !=null and retrieval.strainId != '' ">
- AND retrieval.strain_id = #{retrieval.strainId}
- </if>
<if test="retrieval.farmId != null and retrieval.farmId !=''">
- AND land.farm_id = #{retrieval.farmId}
+ AND (land.farm_id = #{retrieval.farmId} OR inv.fps_id = #{retrieval.farmId})
+ </if>
+ <if test="retrieval.type != null and retrieval.type !='' ">
+ AND retrieval.type = #{retrieval.type}
+ </if>
+ <if test="retrieval.kind != null and retrieval.kind !='' ">
+ AND (inv.product_id = #{retrieval.kind} OR retrieval.strain_id = #{retrieval.kind})
</if>
AND retrieval.is_deleted = 0 ORDER BY retrieval.create_time DESC
</select>
--
Gitblit v1.9.3