From 661fbb7cf5eb50cd4bddcc944abd2a286fc33041 Mon Sep 17 00:00:00 2001 From: x_z Date: Tue, 20 Dec 2022 18:23:31 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E7=A0=81=E8=AF=A6=E6=83=85=E9=80=89=E6=8B=A9=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E6=9F=A5=E8=AF=A2=E6=97=A0=E6=B3=95=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../info/CompanyProductRelevanceController.java | 3 +-- .../admin/dao/basic/BasicUnitMaintainDao.java | 2 ++ .../FilterCompanyProductRelevanceRequest.java | 2 ++ .../service/basic/BasicUnitMaintainService.java | 2 +- .../basic/impl/BasicUnitMaintainServiceImpl.java | 5 +++++ .../mapper/basic/BasicUnitMaintainDao.xml | 16 ++++++++++++++++ 6 files changed, 27 insertions(+), 3 deletions(-) diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java index e521c436..427a8a09 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/info/CompanyProductRelevanceController.java @@ -6,7 +6,6 @@ import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.api.admin.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.admin.entity.info.CompanyEntity; import com.glxp.api.admin.exception.JsonException; import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.admin.req.basic.FilterCompanyProductRelevanceRequest; @@ -105,7 +104,7 @@ public class CompanyProductRelevanceController { for (CompanyProductRelevanceEntity companyProductRelevanceEntity : companyProductRelevanceEntities) { erpIds.add(companyProductRelevanceEntity.getUnitFk()); } - List basicUnitMaintainEntities = basicUnitMaintainService.batchSelectByErpIds(erpIds); + List basicUnitMaintainEntities = basicUnitMaintainService.batchSelectByErpIdsAndName(erpIds, filterCompanyProductRelevanceRequest.getKey()); return ResultVOUtils.success(basicUnitMaintainEntities); } return ResultVOUtils.error(500, "该产品未关联供应商！"); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java index d2310bda..de3d6c8e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.java @@ -33,4 +33,6 @@ public interface BasicUnitMaintainDao { boolean importBasicUnitMaintain(BasicUnitMaintainEntity basicUnitMaintainEntity); + + List batchSelectByErpIdsAndName(@Param("erpIds") List erpIds, @Param("name") String name); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java index 8298efae..7fae042b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterCompanyProductRelevanceRequest.java @@ -12,4 +12,6 @@ public class FilterCompanyProductRelevanceRequest extends ListPageRequest { private String udiRlIdFk; private String unitFk; private String lastUpdateTime; + + private String key; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java index 9b920472..276b00ec 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BasicUnitMaintainService.java @@ -3,7 +3,6 @@ package com.glxp.api.admin.service.basic; import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.admin.req.basic.BasicUnitMaintainSaveRequest; import java.util.List; @@ -38,4 +37,5 @@ public interface BasicUnitMaintainService { List batchSelectByErpIds(List erpIds); + List batchSelectByErpIdsAndName(List erpIds, String name); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java index bf843ee3..83c206f6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.java @@ -87,6 +87,11 @@ public class BasicUnitMaintainServiceImpl implements BasicUnitMaintainService { return basicUnitMaintainDao.batchSelectByErpIds(erpIds); } + @Override + public List batchSelectByErpIdsAndName(List erpIds, String name) { + return basicUnitMaintainDao.batchSelectByErpIdsAndName(erpIds, name); + } + @Override public BasicUnitMaintainEntity selectById(String id) { return basicUnitMaintainDao.selectById(id); diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml index 7558e9c2..0cf4012d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -257,4 +257,20 @@ #{outType} ) + +