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 703e37c..f84e958 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 @@ -29,6 +29,10 @@ public class SupplierBindMaterial extends BaseEntity { @ApiModelProperty(value = "食堂id") private Long canteenId; + private String canteenName; + + private String areaName; + /** 供应商ID */ @Excel(name = "供应商ID") @ApiModelProperty(value = "供应商ID") @@ -57,5 +61,27 @@ public class SupplierBindMaterial extends BaseEntity { @ApiModelProperty(value = "是否供应(1-是,2-否)") private Long ifSupply; + /** 原料名称 */ + @Excel(name = "原料名称") + @ApiModelProperty(value = "原料名称") + private String materialName; + + /** 原料编码 */ + @Excel(name = "原料编码") + @ApiModelProperty(value = "原料编码") + private String materialCode; + + /** 规格 */ + @ApiModelProperty(value = "规格") + private String size; + + @Excel(name = "类别名称") + @ApiModelProperty(value = "类别名称") + private String materialTypeName; + + /** 供应商名称 */ + @Excel(name = "供应商名称") + @ApiModelProperty(value = "供应商名称") + private String supplierName; } 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 1aaeedc..9b27e4a 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 @@ -6,11 +6,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + + @@ -18,24 +25,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, canteen_id, supplier_id, material_id, category_id, alternative_supplier, if_supply, create_by, create_time, update_by, update_time from ims_supplier_bind_material + select isbm.id, isbm.canteen_id, isbm.supplier_id, isbm.material_id, isbm.category_id, isbm.alternative_supplier, + isbm.if_supply, isbm.create_by, isbm.create_time, isbm.update_by, isbm.update_time, bc.canteen_name, + ba.area_name, cm.material_code, cm.material_name, cm.size, cmt.material_type_name, isu.supplier_name + from ims_supplier_bind_material isbm + left join cook_material cm on cm.material_id = isbm.material_id + left join cook_material_type cmt on cmt.material_type_id = cm.material_type_id + left join ims_supplier isu on isu.supplier_id = isbm.supplier_id + left join basic_canteen bc on bc.canteen_id = isbm.canteen_id + left join basic_area ba on ba.area_id = bc.area_id