From 6b2aa0eff36dc5d7e7d14c4342f9d47957b1721b Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Wed, 26 Apr 2023 11:15:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=B5=84=E8=B4=A8?=
 =?UTF-8?q?=E9=A2=84=E8=AD=A6=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchase/FilterCertRemindMsgRequest.java   |  3 +++
 .../mapper/purchase/SupCertRemindMsgDao.xml    | 18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/req/purchase/FilterCertRemindMsgRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterCertRemindMsgRequest.java
index 03ed8c42..b5d8a522 100644
--- a/src/main/java/com/glxp/api/req/purchase/FilterCertRemindMsgRequest.java
+++ b/src/main/java/com/glxp/api/req/purchase/FilterCertRemindMsgRequest.java
@@ -34,4 +34,7 @@ public class FilterCertRemindMsgRequest extends ListPageRequest {
      */
     private Integer ignoreStatus;
 
+    // 证书名称
+    private String certName;
+
 }
diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
index 325cf6f0..ad8d712d 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
@@ -7,6 +7,8 @@
                (select `name` from sup_cert s where s.code = m.code and s.CustomerId = m.idFk) certName
         from sup_cert_remind_msg m
                  left join sup_company c on m.idFk = c.customerId
+        left join sup_cert bc on bc.code = m.code
+
         <where>
             <if test="supId != null and supId != ''">
                 AND m.idFk = #{supId}
@@ -23,6 +25,10 @@
             <if test="type != null">
                 AND m.type = #{type}
             </if>
+            <if test="certName != null and certName != ''">
+                AND bc.name like concat('%', #{certName}, '%')
+            </if>
+
         </where>
         order by m.updateTime desc
     </select>
@@ -33,6 +39,7 @@
                (select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk) certName
         from sup_cert_remind_msg m
                  left join sup_manufacturer c on m.idFk = c.customerId
+                                                     left join sup_cert bc on bc.code = m.code
         <where>
             <if test="supId != null and supId != ''">
                 AND c.customerId = #{supId}
@@ -49,6 +56,10 @@
             <if test="type != null">
                 AND m.type = #{type}
             </if>
+            <if test="certName != null and certName != ''">
+                AND bc.name like concat('%', #{certName}, '%')
+            </if>
+
         </where>
         order by m.updateTime desc
     </select>
@@ -59,6 +70,8 @@
                (select `name` from sup_cert s where s.code = m.code and s.productIdFk = m.idFk) certName
         from sup_cert_remind_msg m
                  left join sup_product c on m.idFk = c.productId
+        left join sup_cert bc on bc.code = m.code
+
         <where>
             <if test="supId != null and supId != ''">
                 AND c.customerId = #{supId}
@@ -75,7 +88,10 @@
             <if test="type != null">
                 AND m.type = #{type}
             </if>
+            <if test="certName != null and certName != ''">
+                AND bc.name like concat('%', #{certName}, '%')
+            </if>
         </where>
         order by m.updateTime desc
     </select>
-</mapper>
\ No newline at end of file
+</mapper>