From c043a6ed695c76950d41894d78f4936338105644 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 21 Mar 2024 11:59:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B5=84=E8=B4=A8=E9=A2=84=E8=AD=A6?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF-=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=BB=A4?=
=?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../purchase/FilterCertRemindMsgRequest.java | 10 ++++++++
.../mapper/purchase/SupCertRemindMsgDao.xml | 24 +++++++++++++++++--
2 files changed, 32 insertions(+), 2 deletions(-)
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 b5d8a522..8834ed2a 100644
--- a/src/main/java/com/glxp/api/req/purchase/FilterCertRemindMsgRequest.java
+++ b/src/main/java/com/glxp/api/req/purchase/FilterCertRemindMsgRequest.java
@@ -37,4 +37,14 @@ public class FilterCertRemindMsgRequest extends ListPageRequest {
// 证书名称
private String certName;
+ /**
+ * 供应商/配送商 名称
+ */
+ private String supName;
+
+ /**
+ * 预警类型
+ */
+ private String warnType;
+
}
diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
index 065cc6f7..fc45f609 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
@@ -16,6 +16,12 @@
AND c.companyName like concat('%', #{name}, '%')
+
+ AND c.companyName like concat('%', #{supName}, '%')
+
+
+ AND m.warnType = #{warnType}
+
AND m.status = #{status}
@@ -39,10 +45,11 @@
c.customerId supId,
(select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk limit 1) certName
,
- (select name from basic_corp where erpId = c.customerId) supName
+ basic_corp.name supName
from sup_cert_remind_msg m
left join sup_manufacturer c on m.idFk = c.manufacturerId
left join sup_cert bc on bc.code = m.code
+ left join basic_corp on basic_corp.erpId = c.customerId
AND c.customerId = #{supId}
@@ -50,6 +57,12 @@
AND c.companyName like concat('%', #{name}, '%')
+
+ AND basic_corp.name like concat('%', #{supName}, '%')
+
+
+ AND m.warnType = #{warnType}
+
AND m.status = #{status}
@@ -73,12 +86,13 @@
c.manufacturerIdFk,
c.customerId supId,
(select `name` from sup_cert s where s.code = m.code and s.productIdFk = m.idFk limit 1) certName,
- (select name from basic_corp where erpId = c.customerId) supName
+ basic_corp.name supName
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
+ left join basic_corp on basic_corp.erpId = c.customerId
@@ -87,6 +101,12 @@
AND c.recordProductName like concat('%', #{name}, '%')
+
+ AND basic_corp.name like concat('%', #{supName}, '%')
+
+
+ AND m.warnType = #{warnType}
+
AND m.status = #{status}