diff --git a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
index cca532c1..cc78d5e3 100644
--- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java
@@ -97,4 +97,5 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
private Integer codeCheck;
private Integer productType;
+ private String bzgg;
}
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 eafe3859..bc6c1e93 100644
--- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
+++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java
@@ -118,6 +118,8 @@ public class FilterUdiRelRequest extends ListPageRequest {
private String cpms;
private Integer productsType = 1;//默认是耗材
private Integer productType;
+ private String bzgg;
+ private String prepnSpec;
/**
* 收费项目编码
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 878c9388..72be0f89 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -627,6 +627,12 @@
AND basic_products.cpms LIKE concat(#{cpms}, '%')
+
+ AND basic_products.bzgg LIKE concat('%', #{bzgg}, '%')
+
+
+ AND basic_products.prepnSpec LIKE concat('%', #{prepnSpec}, '%')
+
and basic_udirel.dispatch = #{dispatch}
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
index 92ce6202..2aab094e 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
@@ -48,7 +48,6 @@
basic_udirel.isAdavence,
basic_udirel.purType,
basic_udirel.attributeType,
- basic_udirel.hcType,
basic_udirel.lowStockNum,
basic_udirel.overStockNum,
basic_udirel.recentDateTime,
@@ -126,7 +125,6 @@
basic_products.syqsfxyjxmj,
basic_products.mjfs,
basic_products.categoryName,
- basic_products.cphhhbh,
basic_products.requireScanCode,
basic_udirel.hcType,
basic_udirel.groupBuy,
@@ -137,7 +135,6 @@
basic_products.catalogname3,
basic_products.matrial,
basic_products.bzgg,
- basic_products.packUnit,
basic_products.prepnSpec,
basic_products.prepnUnit,
basic_products.packMatrial,
@@ -171,6 +168,9 @@
AND ggxh LIKE concat('%', #{ggxh}, '%')
+
+ AND basic_products.bzgg LIKE concat('%', #{bzgg}, '%')
+
AND basic_udirel.purType = #{purType}
@@ -272,6 +272,7 @@
+ GROUP BY rlId
ORDER BY company_product_relevance.updateTime DESC