From d2cd3f803d3fed4dd8ec5323b5d900ec0e8300f8 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 5 Jun 2023 21:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=B3=E8=B4=AD=E5=8D=95=E6=8D=AE=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/req/basic/FilterUdiRelRequest.java    |  1 +
 .../mybatis/mapper/basic/UdiRelevanceDao.xml  | 32 +++++++++++++------
 2 files changed, 24 insertions(+), 9 deletions(-)

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<String> uuids;
     private List<Integer> 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
+
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
                 AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
@@ -203,6 +206,13 @@
             <if test="pinyinInitial != null and pinyinInitial != ''">
                 AND basic_products.pinyinInitial like concat('%', #{pinyinInitial}, '%')
             </if>
+            <if test="thrPiId != '' and thrPiId != null">
+                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}, '%'))
+            </if>
             <if test="ggxh != '' and ggxh != null">
                 AND ggxh LIKE concat('%', #{ggxh}, '%')
             </if>
@@ -262,6 +272,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="flbm != '' and flbm != null">
+                and (tp.flbm = #{flbm} or basic_products.flbm = #{flbm})
+            </if>
+            <if test="companyName != '' and companyName != null">
+                AND basic_corp.name like concat('%', #{companyName}, '%')
+            </if>
         </where>
     </select>
 
@@ -360,7 +376,7 @@
                 AND (basic_udirel.isDisable is null or basic_udirel.isDisable = false)
             </if>
             <if test="isDisable == true">
-                AND  basic_udirel.isDisable = true
+                AND basic_udirel.isDisable = true
             </if>
             <if test="thrPiId != '' and thrPiId != null">
                 and (thirdId LIKE concat('%', #{thrPiId}, '%')
@@ -1272,14 +1288,12 @@
     </select>
 
     <select id="selectRelIdByName" resultType="java.lang.String">
-        SELECT
-            b2.id
-        FROM
-            basic_products b1
-        LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid
+        SELECT b2.id
+        FROM basic_products b1
+                     LEFT JOIN basic_udirel b2 ON b1.uuid = b2.uuid
         <where>
             <if test="productName != '' and productName != null">
-                AND   b1.cpmctymc like concat('%', #{productName}, '%')
+                AND b1.cpmctymc like concat('%', #{productName}, '%')
             </if>
         </where>
     </select>