From f1862398e4f85b927d0b0a637f9c5246bfc22038 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 12 Nov 2024 15:10:15 +0800
Subject: [PATCH] =?UTF-8?q?11/12=20=E4=BE=9B=E5=BA=94=E5=95=86=E9=80=89?=
 =?UTF-8?q?=E5=85=A5=E8=8D=AF=E5=93=81=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=20=E5=8C=85=E8=A3=85=E8=A7=84=E6=A0=BC=20?=
 =?UTF-8?q?=E5=88=B6=E5=89=82=E8=A7=84=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/req/basic/CompanyProductRelevanceRequest.java | 1 +
 .../java/com/glxp/api/req/basic/FilterUdiRelRequest.java   | 2 ++
 .../resources/mybatis/mapper/basic/UdiRelevanceDao.xml     | 6 ++++++
 src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml    | 7 ++++---
 4 files changed, 13 insertions(+), 3 deletions(-)

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 @@
             <if test="cpms != null and cpms != ''">
                 AND basic_products.cpms LIKE concat(#{cpms}, '%')
             </if>
+            <if test="bzgg != null and bzgg != ''">
+                AND basic_products.bzgg LIKE concat('%', #{bzgg}, '%')
+            </if>
+            <if test="prepnSpec != null and prepnSpec != ''">
+                AND basic_products.prepnSpec LIKE concat('%', #{prepnSpec}, '%')
+            </if>
             <if test="dispatch != null">
                 and basic_udirel.dispatch = #{dispatch}
             </if>
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 @@
             <if test="ggxh != '' and ggxh != null">
                 AND ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
+            <if test="bzgg != '' and bzgg != null">
+                AND basic_products.bzgg LIKE concat('%', #{bzgg}, '%')
+            </if>
             <if test="purType != '' and purType != null">
                 AND basic_udirel.purType = #{purType}
             </if>
@@ -272,6 +272,7 @@
                 </foreach>
             </if>
         </where>
+        GROUP BY rlId
         ORDER BY company_product_relevance.updateTime DESC
     </select>