@ -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;
}
@ -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,
@ -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 test="category != null and category != ''">
and rc.category = #{category}