diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 1399880..285b2ee 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -34,5 +34,5 @@ List listPageBySubpackageCertificate(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); - List selectListForReadWriter(@Param("gunSet") Set gunSet, @Param("tIds") Set tIds); + List selectListForReadWriter(@Param("gunSet") Set gunSet, @Param("tIds") Set tIds, @Param("customerId")Long customerId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 1399880..285b2ee 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -34,5 +34,5 @@ List listPageBySubpackageCertificate(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); - List selectListForReadWriter(@Param("gunSet") Set gunSet, @Param("tIds") Set tIds); + List selectListForReadWriter(@Param("gunSet") Set gunSet, @Param("tIds") Set tIds, @Param("customerId")Long customerId); } diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index fbcdf85..680116a 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -250,6 +250,9 @@ #{id} + + AND bo.customer_id = #{customerId} + AND csi.id NOT IN ( SELECT sample_id diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 1399880..285b2ee 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -34,5 +34,5 @@ List listPageBySubpackageCertificate(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); - List selectListForReadWriter(@Param("gunSet") Set gunSet, @Param("tIds") Set tIds); + List selectListForReadWriter(@Param("gunSet") Set gunSet, @Param("tIds") Set tIds, @Param("customerId")Long customerId); } diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index fbcdf85..680116a 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -250,6 +250,9 @@ #{id} + + AND bo.customer_id = #{customerId} + AND csi.id NOT IN ( SELECT sample_id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java index ed728bd..1c4d904 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java @@ -18,4 +18,6 @@ private String status; @ApiModelProperty(value = "扫码集合", dataType = "Set") private Set strSet; + @ApiModelProperty(value = "委托方id", dataType = "委托书场景传") + private Long customerId; } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java index 1399880..285b2ee 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/customer/CustomerSampleMapper.java @@ -34,5 +34,5 @@ List listPageBySubpackageCertificate(@Param("page") Page page, @Param("request") InterchangeSampleListRequest request); - List selectListForReadWriter(@Param("gunSet") Set gunSet, @Param("tIds") Set tIds); + List selectListForReadWriter(@Param("gunSet") Set gunSet, @Param("tIds") Set tIds, @Param("customerId")Long customerId); } diff --git a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml index fbcdf85..680116a 100644 --- a/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/customer/CustomerSampleMapper.xml @@ -250,6 +250,9 @@ #{id} + + AND bo.customer_id = #{customerId} + AND csi.id NOT IN ( SELECT sample_id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java index ed728bd..1c4d904 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/dispatch/SampleLabelReadListRequest.java @@ -18,4 +18,6 @@ private String status; @ApiModelProperty(value = "扫码集合", dataType = "Set") private Set strSet; + @ApiModelProperty(value = "委托方id", dataType = "委托书场景传") + private Long customerId; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessReadWriterServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessReadWriterServiceImpl.java index 34ac254..897c859 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessReadWriterServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessReadWriterServiceImpl.java @@ -57,7 +57,7 @@ return ReturnUtil.success(new ArrayList<>()); } //查询标签样品信息 - List resultList = queryReadSampleList(strSet); + List resultList = queryReadSampleList(strSet, null); return ReturnUtil.success(resultList); } @@ -77,18 +77,18 @@ if (!CollectionUtils.isEmpty(request.getStrSet()) && StringUtils.isEmpty(request.getSceneNo())) { List firstSamples = new ArrayList<>(); List secondSamples = new ArrayList<>(); - firstSamples = queryGunReadSampleList(request.getStrSet()); - secondSamples = queryReadSampleList(request.getStrSet()); + firstSamples = queryGunReadSampleList(request.getStrSet(), null); + secondSamples = queryReadSampleList(request.getStrSet(), null); resultList.addAll(firstSamples); resultList.addAll(secondSamples); }else { //获取不同场景样品列表 - resultList = handleSceneSample(request.getSceneNo(), request.getStatus(), request.getStrSet()); + resultList = handleSceneSample(request.getSceneNo(), request.getStatus(), request.getStrSet(), request.getCustomerId()); } return ReturnUtil.success(resultList); } - private List handleSceneSample(String sceneNo, String status, Set strSet) throws Exception { + private List handleSceneSample(String sceneNo, String status, Set strSet, Long customerId) throws Exception { List resultList = new ArrayList<>(); if(sceneNo.equals("1")){ Page page = PageFactory.defaultPage(); @@ -114,8 +114,8 @@ resultList = ConvertUtils.sourceToTarget(records, ReadSampleDTO.class); }else if(sceneNo.equals("2")){ //新建委托书:委托书场景 - List readSampleDTOS = queryGunReadSampleList(strSet); - List readSampleDTOS1 = queryReadSampleList(strSet); + List readSampleDTOS = queryGunReadSampleList(strSet, customerId); + List readSampleDTOS1 = queryReadSampleList(strSet, customerId); List readSampleList = new ArrayList<>(); readSampleList.addAll(readSampleDTOS); readSampleList.addAll(readSampleDTOS1); @@ -156,13 +156,13 @@ return collect; } - private List queryGunReadSampleList(Set gunSet) { - List readSampleDTOS = sampleMapper.selectListForReadWriter(gunSet, null); + private List queryGunReadSampleList(Set gunSet, Long customerId) { + List readSampleDTOS = sampleMapper.selectListForReadWriter(gunSet, null, customerId); return readSampleDTOS; } - private List queryReadSampleList(Set tIds) { - List readSampleDTOS = sampleMapper.selectListForReadWriter(null, tIds); + private List queryReadSampleList(Set tIds, Long customerId) { + List readSampleDTOS = sampleMapper.selectListForReadWriter(null, tIds, customerId); return readSampleDTOS; }