From 81fbedcfba57b88b12f36a877728d4f88bd798e6 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 14 Apr 2023 16:50:21 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/glxp/api/req/inv/FilterInvRemindMsgRequest.java | 4 ++++
.../resources/mybatis/mapper/inv/InvRemindMsgDao.xml | 9 ++++++---
src/main/resources/mybatis/mapper/inv/invProductDao.xml | 6 +++---
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java
index 9da2dec1..14b8cb8b 100644
--- a/src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java
+++ b/src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java
@@ -59,4 +59,8 @@ public class FilterInvRemindMsgRequest extends ListPageRequest {
*/
private String supId;
+ /**
+ * 物资名称
+ */
+ private String productName;
}
diff --git a/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml b/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml
index bc1d3473..7179c568 100644
--- a/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml
@@ -28,8 +28,8 @@
(select `name` from auth_space where `code` = irm.invSpaceCode and invCode = irm.invCode) invSpaceName,
(select `name` from basic_corp where erpId = irm.supId) supName
from inv_remind_msg irm
- left join basic_udirel bu on bu.id = irm.relId
- left join basic_products bp on bp.uuid = bu.uuid
+ left join basic_udirel bu on bu.id = irm.relId
+ left join basic_products bp on bp.uuid = bu.uuid
<where>
<if test="relId != null and relId != ''">
AND irm.relId = #{relId}
@@ -50,7 +50,7 @@
AND irm.ignoreStatus = #{ignoreStatus}
</if>
<if test="ggxh != null and ggxh != ''">
- AND bp.ggxh = #{ggxh}
+ AND bp.ggxh like concat('%', #{ggxh}, '%')
</if>
<if test="type != null and type != ''">
AND type = #{type}
@@ -58,6 +58,9 @@
<if test="supId != null">
AND irm.supId = #{supId}
</if>
+ <if test="productName != null and productName != ''">
+ AND bp.cpmctymc like concat('%', #{productName}, '%')
+ </if>
</where>
order by irm.updateTime desc
</select>
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index 7243cfaa..7b420be4 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -252,9 +252,9 @@
ip.productionDate,
ip.expireDate,
ip.supId,
- sum(ip.inCount) incount,
- sum(ip.outCount) outCount,
- sum(ip.reCount) reCount
+ ip.inCount,
+ ip.outCount,
+ ip.reCount
from inv_product ip
left join inv_product_detail ipd
on ip.relIdFk = ipd.relId and ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')