diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
index 27323dcf..15034ffa 100644
--- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
+++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java
@@ -85,6 +85,8 @@ public class UdiProductEntity {
private Long relSupId;
+ private Boolean groupBuy;
+
public Boolean getAllowNoBatch() {
if (allowNoBatch == null)
diff --git a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
index bd650b30..d921907e 100644
--- a/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
+++ b/src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java
@@ -92,4 +92,6 @@ public class UdiRlSupResponse {
//产品id
private String PRId;
private String classifyName;
+
+ private boolean groupBuy; //是否集采产品
}
diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
index f8e684b1..19ba6662 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml
@@ -126,6 +126,9 @@
AND bu.corpType = #{corpType}
+
+ AND bu.actionType = #{actionType}
+
AND bu.sortNum = #{sortNum}
diff --git a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
index 60801132..73e708ff 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiProductDao.xml
@@ -793,6 +793,9 @@
updateTime=#{updateTime},
+
+ groupBuy=#{groupBuy},
+
where id = #{id}
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 1c371d0f..ce703666 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -305,7 +305,8 @@
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
- basic_products.basicPrductRemak8
+ basic_products.groupBuy,
+ basic_products.basicPrductRemak8
FROM basic_products
inner JOIN basic_udirel
ON basic_products.uuid = basic_udirel.uuid
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
index 5ab6e0d4..7820609a 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
@@ -105,6 +105,7 @@
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8,
+ basic_products.groupBuy,
basic_corp.name companyName
FROM company_product_relevance
inner JOIN basic_udirel
diff --git a/src/main/resources/schemas/schema_v2.1.sql b/src/main/resources/schemas/schema_v2.1.sql
index fb98ec3c..05273196 100644
--- a/src/main/resources/schemas/schema_v2.1.sql
+++ b/src/main/resources/schemas/schema_v2.1.sql
@@ -50,6 +50,8 @@ CALL Pro_Temp_ColumnWork('thr_products', 'updateUser', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('thr_products', 'createUser', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('thr_products', 'createTime', 'varchar(255) ', 1);
+CALL Pro_Temp_ColumnWork('basic_products', 'groupBuy', 'tinyint ', 1);
+
CALL Pro_Temp_ColumnWork('auth_warehouse', 'advanceType', 'tinyint', 1);