diff --git a/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java index b84ff9ad..b8ba1590 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/MaterialInfoEntity.java @@ -120,6 +120,7 @@ public class MaterialInfoEntity implements Serializable { private java.lang.String izEnabledName; private java.lang.String wlId; + private String gysName; private String categoryName; private String typeName; diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index 09b98431..8d92b683 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -646,7 +646,11 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl> getGysList(MaterialInfoEntity materialInfoEntityDto, HttpServletRequest req) { - List gysList = gysMapper.selectList(new QueryWrapper().eq("del_flag","0")); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(materialInfoEntityDto.getGysName()),"suppliers_name",materialInfoEntityDto.getGysName()); + queryWrapper.eq("del_flag","0"); + queryWrapper.eq("iz_enabled","Y"); + List gysList = gysMapper.selectList(queryWrapper); List> list = new ArrayList<>(); for(ConfigSuppliersInfo gys : gysList){ Map map = new HashMap<>();