diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index c5b477080..0b9f3b53f 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -75,5 +75,6 @@ public class FilterUdiRelRequest extends ListPageRequest { private List uuids; private List ids; + private String flbm; } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 982bdce3c..a47d99417 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -179,14 +179,17 @@ basic_products.basicPrductRemak7, basic_products.basicPrductRemak8, company_product_relevance.unitFk, - basic_corp.erpId as customerId, - basic_corp.name companyName + basic_corp.erpId as customerId, + basic_corp.name companyName FROM basic_udirel inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid left join company_product_relevance on basic_udirel.id = company_product_relevance.udiRlIdFk left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId + left join basic_hosp_type bht on basic_udirel.relCode = bht.code + left join thr_products tp on tp.code = basic_udirel.mainId + AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%') @@ -203,6 +206,13 @@ AND basic_products.pinyinInitial like concat('%', #{pinyinInitial}, '%') + + and (thirdId LIKE concat('%', #{thrPiId}, '%') + or thirdId1 LIKE concat('%', #{thrPiId}, '%') + or thirdId2 LIKE concat('%', #{thrPiId}, '%') + or thirdId3 LIKE concat('%', #{thrPiId}, '%') + or thirdId4 LIKE concat('%', #{thrPiId}, '%')) + AND ggxh LIKE concat('%', #{ggxh}, '%') @@ -262,6 +272,12 @@ #{item} + + and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm}) + + + AND basic_corp.name like concat('%', #{companyName}, '%') + @@ -360,7 +376,7 @@ AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false) - AND basic_udirel.isDisable = true + AND basic_udirel.isDisable = true and (thirdId LIKE concat('%', #{thrPiId}, '%') @@ -1272,14 +1288,12 @@