diff --git a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java index e9193b093..3c1998750 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiRelevanceDao.java @@ -118,4 +118,11 @@ public interface UdiRelevanceDao extends BaseMapperPlus selectRelIdByName(@Param("productName") String productName); } diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvRemindSetRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvRemindSetRequest.java index 64a76c6a4..54cd78c89 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvRemindSetRequest.java +++ b/src/main/java/com/glxp/api/req/inv/FilterInvRemindSetRequest.java @@ -3,6 +3,8 @@ package com.glxp.api.req.inv; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; +import java.util.List; + /** * 库存预警设置查询参数 */ @@ -34,4 +36,8 @@ public class FilterInvRemindSetRequest extends ListPageRequest { */ private Integer status; + private String productName; + + List relIds; + } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java index 0aeebd44f..4acac556c 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvRemindSetServiceImpl.java @@ -52,6 +52,10 @@ public class InvRemindSetServiceImpl implements InvRemindSetService { if (null != filterInvRemindSetRequest.getPage() && null != filterInvRemindSetRequest.getLimit()) { PageHelper.offsetPage((filterInvRemindSetRequest.getPage() - 1) * filterInvRemindSetRequest.getLimit(), filterInvRemindSetRequest.getLimit()); } + if(StrUtil.isNotBlank(filterInvRemindSetRequest.getProductName())){ + filterInvRemindSetRequest.setRelIds(udiRelevanceDao.selectRelIdByName(filterInvRemindSetRequest.getProductName())); + } + List list = invRemindSetDao.filterList(filterInvRemindSetRequest); if (CollUtil.isNotEmpty(list)) { list.forEach(invRemindSetResponse -> { diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index e480f0765..9a23e5f8d 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -1256,4 +1256,17 @@ limit 1 + + diff --git a/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml b/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml index 8a9f6afee..59d1972ce 100644 --- a/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvRemindSetDao.xml @@ -38,6 +38,13 @@ AND irs.status = #{status} + + AND irs.relId IN + + #{item} + + + order by irs.updateTime desc