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 - and wc.reagent_consumable_name = #{keywords} + and wc.reagent_consumable_name like concat ('%',#{keywords} ,'%' ) and rc.category = #{category}