bug修改

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)

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;           //是否集采产品
 }

src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml

@@ -126,6 +126,9 @@
             <if test="corpType != null">
                 AND bu.corpType = #{corpType}
             </if>
+            <if test="actionType != null">
+                AND bu.actionType = #{actionType}
+            </if>
             <if test="sortNum != null">
                 AND bu.sortNum = #{sortNum}
             </if>

src/main/resources/mybatis/mapper/basic/UdiProductDao.xml

@@ -793,6 +793,9 @@
             <if test="updateTime != null">
                 updateTime=#{updateTime},
             </if>
+            <if test="groupBuy != null">
+                groupBuy=#{groupBuy},
+            </if>
         </trim>
         where id = #{id}
     </update>

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

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

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);