From 545905a5f3097009f3282440ee414cef4da57aae Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Mon, 5 Jun 2023 19:17:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=B3=E8=B4=AD=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=BD=95=E5=85=A5=E5=A4=9A=E9=80=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/basic/UdiRlSupController.java | 10 ++++++++++ .../api/controller/purchase/PurApplyController.java | 10 +++++++--- .../glxp/api/entity/purchase/PurApplyDetailEntity.java | 2 +- .../com/glxp/api/req/basic/FilterUdiRelRequest.java | 1 + .../resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 6 ++++++ 5 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index ba1431c84..3657a175b 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -15,6 +15,7 @@ import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.basic.UdiRlSupEntity; +import com.glxp.api.entity.purchase.PurApplyDetailEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; @@ -28,6 +29,7 @@ import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.basic.*; +import com.glxp.api.service.purchase.PurApplyDetailService; import com.glxp.api.service.system.CompanyService; import com.glxp.api.util.BeanCopyUtils; import com.glxp.api.util.SupplementVailUtil; @@ -45,6 +47,7 @@ import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * 供应商关联耗材字典信息 @@ -70,6 +73,8 @@ public class UdiRlSupController extends BaseController { private SupplementVailUtil supplementVailUtil; @Resource private UdiProductService udiProductService; + @Resource + private PurApplyDetailService purApplyDetailService; @AuthRuleAnnotation("") @GetMapping("/sale/info/company/product/relevance/filter") @@ -154,9 +159,14 @@ public class UdiRlSupController extends BaseController { //只查找主标识产品信息 companyProductRelevanceRequest.setDiType(1); } + //查询详情id过滤 + List purApplyDetailEntityList= purApplyDetailService.findByOrderId(companyProductRelevanceRequest.getId()); + List idList = purApplyDetailEntityList.stream().map(PurApplyDetailEntity::getProductId).collect(Collectors.toList()); + List basicInstrumentMaintainRelevanceResponses = null; FilterUdiRelRequest filterUdiRelRequest=new FilterUdiRelRequest(); BeanCopyUtils.copy(companyProductRelevanceRequest,filterUdiRelRequest); + filterUdiRelRequest.setIds(idList); basicInstrumentMaintainRelevanceResponses = udiRelevanceService.filterUdiJoinSup(filterUdiRelRequest); PageInfo pageInfo; pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index a35cb390c..53c117aa8 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -477,10 +477,14 @@ public class PurApplyController { */ @RepeatSubmit() @PostMapping("/purchase/apply/addDetail") - public BaseResponse addDetail(@RequestBody PurApplyDetailEntity purApplyDetailEntity) { + public BaseResponse addDetail(@RequestBody List list) { - purApplyDetailService.insert(purApplyDetailEntity); - return ResultVOUtils.success(purApplyDetailEntity.getOrderIdFk()); + + for (PurApplyDetailEntity purApplyDetailEntity : list) { + purApplyDetailService.insert(purApplyDetailEntity); + + } + return ResultVOUtils.success(list.get(0).getOrderIdFk()); } /** diff --git a/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java index 26ab1dc91..155707435 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurApplyDetailEntity.java @@ -61,4 +61,4 @@ public class PurApplyDetailEntity { public static final String COL_SUPID = "supId"; public static final String COL_ZCZBHHZBAPZBH = "zczbhhzbapzbh"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java index 28c352faf..c5b477080 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java @@ -74,5 +74,6 @@ public class FilterUdiRelRequest extends ListPageRequest { private Boolean groupBuy; private List uuids; + private List ids; } diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index a9f301b5d..982bdce3c 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -194,6 +194,12 @@ AND supName LIKE concat('%', #{supName}, '%') + + and basic_udirel.id not in + + #{item} + + AND basic_products.pinyinInitial like concat('%', #{pinyinInitial}, '%')