diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java index ce81ed8b..8d044325 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java @@ -69,9 +69,10 @@ public class SupplierController extends BaseController { HttpServletRequest request)throws Exception { String supplier = StringUtil.getInfo(search, "supplier"); String type = StringUtil.getInfo(search, "type"); + String contacts = StringUtil.getInfo(search, "contacts"); String phonenum = StringUtil.getInfo(search, "phonenum"); String telephone = StringUtil.getInfo(search, "telephone"); - List list = supplierService.select(supplier, type, phonenum, telephone); + List list = supplierService.select(supplier, type, contacts, phonenum, telephone); return getDataTable(list); } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java index 0cc35603..41a75b0e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java @@ -12,6 +12,7 @@ public interface SupplierMapperEx { List selectByConditionSupplier( @Param("supplier") String supplier, @Param("type") String type, + @Param("contacts") String contacts, @Param("phonenum") String phonenum, @Param("telephone") String telephone, @Param("creatorArray") String[] creatorArray); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/SupplierService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/SupplierService.java index 2b086f94..d957ad01 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/SupplierService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/SupplierService.java @@ -87,12 +87,12 @@ public class SupplierService { return list; } - public List select(String supplier, String type, String phonenum, String telephone) throws Exception{ + public List select(String supplier, String type, String contacts, String phonenum, String telephone) throws Exception{ List list = new ArrayList<>(); try{ String [] creatorArray = depotHeadService.getCreatorArray(); PageUtils.startPage(); - list = supplierMapperEx.selectByConditionSupplier(supplier, type, phonenum, telephone, creatorArray); + list = supplierMapperEx.selectByConditionSupplier(supplier, type, contacts, phonenum, telephone, creatorArray); for(Supplier s : list) { Integer supplierId = s.getId().intValue(); String beginTime = Tools.getYearBegin(); diff --git a/jshERP-boot/src/main/resources/mapper_xml/SupplierMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/SupplierMapperEx.xml index 4adf61d5..d2c79a43 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/SupplierMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/SupplierMapperEx.xml @@ -12,6 +12,10 @@ and type=#{type} + + + and contacts like #{bindContacts} + and phone_num like #{bindPhoneNum}