新增申购产品录入多选问题

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<PurApplyDetailEntity> purApplyDetailEntityList= purApplyDetailService.findByOrderId(companyProductRelevanceRequest.getId());
+        List<Integer> idList = purApplyDetailEntityList.stream().map(PurApplyDetailEntity::getProductId).collect(Collectors.toList());
+
         List<UdiRelevanceResponse> basicInstrumentMaintainRelevanceResponses = null;
         FilterUdiRelRequest filterUdiRelRequest=new FilterUdiRelRequest();
         BeanCopyUtils.copy(companyProductRelevanceRequest,filterUdiRelRequest);
+        filterUdiRelRequest.setIds(idList);
         basicInstrumentMaintainRelevanceResponses = udiRelevanceService.filterUdiJoinSup(filterUdiRelRequest);
         PageInfo<UdiRelevanceResponse> pageInfo;
         pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses);

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<PurApplyDetailEntity>  list) {
 
+
+        for (PurApplyDetailEntity purApplyDetailEntity : list) {
             purApplyDetailService.insert(purApplyDetailEntity);
-        return ResultVOUtils.success(purApplyDetailEntity.getOrderIdFk());
+
+        }
+        return ResultVOUtils.success(list.get(0).getOrderIdFk());
     }
 
     /**

src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java

@@ -74,5 +74,6 @@ public class FilterUdiRelRequest extends ListPageRequest {
     private Boolean groupBuy;
 
     private List<String> uuids;
+    private List<Integer> ids;
 
 }

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -194,6 +194,12 @@
             <if test="supName != '' and supName != null">
                 AND supName LIKE concat('%', #{supName}, '%')
             </if>
+            <if test="ids != null and ids.size() > 0">
+                and basic_udirel.id not in
+                <foreach collection="ids" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             <if test="pinyinInitial != null and pinyinInitial != ''">
                 AND basic_products.pinyinInitial like concat('%', #{pinyinInitial}, '%')
             </if>