From 4d60a2ee6bbfe76e2740307c832c8f309090a41e Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 19 Aug 2022 10:42:06 +0800
Subject: [PATCH] 加工产品在销售记录表和损耗记录表中加上相应的地块
---
src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml | 14 ++++++++++++--
1 files changed, 12 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..b37715e 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,25 @@
<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,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
+ where
+ <if test="inventory.strainId !=null and inventory.strainId != '' ">
+ inventory.strain_id = #{inventory.strainId} AND
+ </if>
+ <if test="inventory.farmId != null and inventory.farmId !='' ">
+ land.farm_id = #{inventory.farmId} AND
+ </if>
+ bdb.code = "lossReason" AND inventory.is_deleted = 0 ORDER BY inventory.create_time DESC
</select>
</mapper>
--
Gitblit v1.9.3