From 62084735c1f5d6b6d4771aadf4d9241479a4d4ee Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 24 Oct 2022 15:06:16 +0800
Subject: [PATCH] 用户查询增加模糊查询；修复当编辑用户时账号解封的问题；全景管理查询未删除的数据；当性别，生日未填时数据库同时也录入数据
---
src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 3a2a3d9..ffec6f1 100644
--- a/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
+++ b/src/main/java/org/springblade/modules/InventoryLoss/mapper/InventoryMapper.xml
@@ -12,15 +12,27 @@
<select id="selectSalePage" resultMap="inventoryResultMap">
select inventory.*,
- strain.strain_name,bdb.dict_value
+ 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
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
- <if test="inventory.strainId !=null and inventory.strainId != '' ">
- inventory.strain_id = #{inventory.strainId} AND
+ 1=1
+ <if test="inventory.farmId != null and inventory.farmId !=''">
+ AND (land.farm_id = #{inventory.farmId} OR inv.fps_id = #{inventory.farmId})
</if>
- bdb.code = "lossReason" AND inventory.is_deleted = 0
+ <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