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/InventoryLoss/mapper/InventoryMapper.xml |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
index f3b7355..ffec6f1 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
+++ b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
@@ -6,15 +6,33 @@
     <resultMap id="inventoryResultMap" type="org.springblade.modules.InventoryLoss.vo.InventoryVO">
         <result column="id" property="id"/>
         <result column="strain_name" property="strainName"/>
+        <result column="dict_value" property="reasonName"/>
     </resultMap>
 
 
     <select id="selectSalePage" resultMap="inventoryResultMap">
         select inventory.*,
-               strain.strain_name
+               strain.strain_name,mach.machining_type AS proName,bdb.dict_value
         from sys_inventory inventory
         LEFT JOIN sys_strain strain on inventory.strain_id = strain.id
-        where is_deleted = 0
+        LEFT JOIN blade_dict_biz bdb ON inventory.reason = bdb.dict_key
+        LEFT JOIN sys_land land ON land.id = inventory.land_id
+        LEFT JOIN sys_process_inv inv ON inv.id = inventory.prod_id
+        LEFT JOIN sys_machining mach ON mach.id = inv.product_id
+        where
+        1=1
+        <if test="inventory.farmId != null and inventory.farmId !=''">
+            AND (land.farm_id = #{inventory.farmId} OR inv.fps_id = #{inventory.farmId})
+        </if>
+        <if test="inventory.type != null and inventory.type !='' ">
+            AND inventory.type = #{inventory.type}
+        </if>
+        <if test="inventory.kind != null and inventory.kind !='' ">
+            AND (inv.product_id = #{inventory.kind} OR inventory.strain_id = #{inventory.kind})
+        </if>
+            AND bdb.code = "lossReason"
+            AND inventory.is_deleted = 0
+            ORDER BY inventory.create_time DESC
     </select>
 
 </mapper>

--
Gitblit v1.9.3