11/14 供应商药品维护高级查询

src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java

@@ -98,4 +98,6 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
 
     private Integer productType;
     private String bzgg;
+
+    private String keyWords;
 }

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

@@ -532,7 +532,6 @@
                 or basic_products.cpmctymc LIKE concat('%', #{keyWords}, '%')
                 or basic_products.ggxh LIKE concat('%', #{keyWords}, '%')
                 or basic_products.zczbhhzbapzbh LIKE concat('%', #{keyWords}, '%')
-                or basic_products.zczbhhzbapzbh LIKE concat('%', #{keyWords}, '%')
                 or basic_products.manufactory LIKE concat('%', #{keyWords}, '%')
                 or basic_products.ybbm LIKE concat(#{keyWords}, '%')
                 or basic_products.bzgg LIKE concat('%', #{keyWords}, '%')

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

@@ -155,7 +155,9 @@
                      left join basic_hosp_type bht on basic_udirel.relCode = bht.code
         <where>
             <if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
-                AND ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
+                and (
+                ylqxzcrbarmc LIKE concat(#{ylqxzcrbarmc}, '%')
+                or basic_products.manufactory LIKE concat('%', #{ylqxzcrbarmc}, '%'))
             </if>
             <if test="mainId != '' and mainId != null">
                 AND basic_udirel.mainId LIKE concat('%', #{mainId}, '%')
@@ -269,6 +271,22 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="keyWords != '' and keyWords != null">
+                AND (
+                basic_products.nameCode LIKE concat('%', #{keyWords}, '%')
+                or basic_products.ybbm LIKE concat('%', #{keyWords}, '%')
+                or basic_products.sptm LIKE concat('%', #{keyWords}, '%')
+                or basic_products.bzgg LIKE concat('%', #{keyWords}, '%')
+                or basic_products.prepnSpec LIKE concat('%', #{keyWords}, '%')
+                or basic_products.cpmctymc LIKE concat('%', #{keyWords}, '%')
+                or basic_products.ggxh LIKE concat('%', #{keyWords}, '%')
+                or basic_products.manufactory LIKE concat('%', #{keyWords}, '%')
+                or basic_udirel.thirdId LIKE concat('%', #{keyWords}, '%')
+                or basic_udirel.thirdId1 LIKE concat('%', #{keyWords}, '%')
+                or basic_udirel.thirdId2 LIKE concat('%', #{keyWords}, '%')
+                or basic_udirel.thirdId3 LIKE concat('%', #{keyWords}, '%')
+                or basic_udirel.thirdId4 LIKE concat('%', #{keyWords}, '%'))
+            </if>
         </where>
         GROUP BY basic_udirel.id
         ORDER BY company_product_relevance.updateTime DESC