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/basic/BasicCorpImportLogDao.xml b/src/main/resources/mybatis/mapper/basic/BasicCorpImportLogDao.xml
index f40a7e64..a8363166 100644
--- a/src/main/resources/mybatis/mapper/basic/BasicCorpImportLogDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/BasicCorpImportLogDao.xml
@@ -13,7 +13,7 @@
AND id = #{id}
-
+
AND status = #{status}
@@ -50,4 +50,4 @@
WHERE genKey = #{genKey}
-
\ No newline at end of file
+
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index 8b42ac88..ce1911a6 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -26,14 +26,14 @@
auth_warehouse.name invName,
ip.deptCode,
ip.invCode,
- as.name spaceName
+ s.name spaceName
from inv_product ip
inner join basic_udirel on ip.relIdFk = basic_udirel.id
inner join basic_products bp on basic_udirel.uuid = bp.uuid
left join basic_corp on ip.supId = basic_corp.erpId
left join auth_dept on auth_dept.code = ip.deptCode
left join auth_warehouse on auth_warehouse.code = ip.invCode
- left join auth_space `as` on ip.invSpaceCode = `as`.code
+ left join auth_space s on ip.invSpaceCode = s.code
bp.diType = 1
@@ -85,7 +85,7 @@
- GROUP BY ip.relIdFk, ip.batchNo
+ GROUP BY ip.relIdFk, ip.batchNo, ip.supId
order by ip.updateTime desc
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
+
AND m.idFk = #{supId}
@@ -23,6 +25,10 @@
AND m.type = #{type}
+
+ AND bc.name like concat('%', #{certName}, '%')
+
+
order by m.updateTime desc
@@ -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
AND c.customerId = #{supId}
@@ -49,6 +56,10 @@
AND m.type = #{type}
+
+ AND bc.name like concat('%', #{certName}, '%')
+
+
order by m.updateTime desc
@@ -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
+
AND c.customerId = #{supId}
@@ -75,7 +88,10 @@
AND m.type = #{type}
+
+ AND bc.name like concat('%', #{certName}, '%')
+
order by m.updateTime desc
-
\ No newline at end of file
+