diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java index 0c73fc3..1872bf6 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/ims/domain/SupplierBindMaterial.java @@ -92,4 +92,6 @@ public class SupplierBindMaterial extends BaseEntity { @ApiModelProperty(value = "供应商名称") private String supplierName; + private List materialTypeIds; + } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierBindMaterialMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierBindMaterialMapper.xml index 4bca402..191a996 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierBindMaterialMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/ims/SupplierBindMaterialMapper.xml @@ -44,10 +44,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and isbm.canteen_id = #{canteenId} and isbm.supplier_id = #{supplierId} + and isu.supplier_name like concat('%', #{supplierName}, '%') and isbm.material_id = #{materialId} and isbm.category_id = #{categoryId} and isbm.alternative_supplier = #{alternativeSupplier} and isbm.if_supply = #{ifSupply} + + and cm.material_type_id in + + #{materialTypeId} + +