From c8f839887519b516290ed83abb31c21394bd7cfc Mon Sep 17 00:00:00 2001
From: yanghh <1344638791@qq.com>
Date: Mon, 15 Apr 2024 17:29:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/reagent/entity/ReagentConsumables.java           | 4 ++--
 .../resources/mapper/ReagentConsumableInventoryMapper.xml     | 1 -
 src/main/resources/mapper/WarehousingContentMapper.xml        | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumables.java b/src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumables.java
index 8c7c61c..0dddc0d 100644
--- a/src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumables.java
+++ b/src/main/java/digital/laboratory/platform/reagent/entity/ReagentConsumables.java
@@ -130,7 +130,7 @@ public class ReagentConsumables extends BaseEntity {
     @ApiModelProperty(value="reagentConsumableId")
     private String reagentConsumableId;
 
-    @ApiModelProperty(value = "存储期限")
-    private Integer storageLife;
+//    @ApiModelProperty(value = "存储期限")
+//    private Integer storageLife;
 
 }
diff --git a/src/main/resources/mapper/ReagentConsumableInventoryMapper.xml b/src/main/resources/mapper/ReagentConsumableInventoryMapper.xml
index 353d2ca..2de092e 100644
--- a/src/main/resources/mapper/ReagentConsumableInventoryMapper.xml
+++ b/src/main/resources/mapper/ReagentConsumableInventoryMapper.xml
@@ -143,7 +143,6 @@
         rm.alias,
         rm.remark,
         rm.configuration_concentration,
-        rm.storage_life,
         rci.warning_information,
         r1.`status` as reference_material_status,
         r1.`id` as reference_material_id,
diff --git a/src/main/resources/mapper/WarehousingContentMapper.xml b/src/main/resources/mapper/WarehousingContentMapper.xml
index 0dfc84f..bc59e3d 100644
--- a/src/main/resources/mapper/WarehousingContentMapper.xml
+++ b/src/main/resources/mapper/WarehousingContentMapper.xml
@@ -138,7 +138,7 @@
             and wc.warehousing_quantity = wc.total_quantity
         </if>
         <if test="keywords != null and keywords != ''">
-            and wc.reagent_consumable_name = #{keywords}
+            and wc.reagent_consumable_name like concat ('%',#{keywords} ,'%' )
         </if>
         <if test="category != null and category != ''">
             and rc.category = #{category}