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 897c859..ee8ee1e 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 @@ -11,6 +11,8 @@ import com.casic.missiles.dto.business.dispatch.SampleLabelReadListRequest; import com.casic.missiles.dto.business.labExecutive.SampleLabExecutiveListRequest; import com.casic.missiles.dto.business.labExecutive.SampleLabExecutiveListResponse; +import com.casic.missiles.dto.customer.sample.MultiItemSampleListResponse; +import com.casic.missiles.dto.customer.sample.OrderSampleListRequest; import com.casic.missiles.enums.business.MeasureStatusEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.mapper.MeterFixedAssetsMapper; @@ -19,6 +21,7 @@ import com.casic.missiles.service.business.IBusinessDispatchService; import com.casic.missiles.service.business.IBusinessLabExecutiveInfoService; import com.casic.missiles.service.business.IBusinessReadWriterService; +import com.casic.missiles.service.customer.CustomerSampleService; import com.casic.missiles.utils.ConvertUtils; import gnu.io.SerialPort; import lombok.extern.slf4j.Slf4j; @@ -48,6 +51,8 @@ private IBusinessDispatchService businessDispatchService; @Autowired private IBusinessLabExecutiveInfoService businessLabExecutiveInfoService; + @Autowired + private CustomerSampleService customerSampleService; public static SerialPort serialPort = null; @@ -114,12 +119,15 @@ resultList = ConvertUtils.sourceToTarget(records, ReadSampleDTO.class); }else if(sceneNo.equals("2")){ //新建委托书:委托书场景 - List readSampleDTOS = queryGunReadSampleList(strSet, customerId); - List readSampleDTOS1 = queryReadSampleList(strSet, customerId); - List readSampleList = new ArrayList<>(); - readSampleList.addAll(readSampleDTOS); - readSampleList.addAll(readSampleDTOS1); - return readSampleList; + Page page = PageFactory.defaultPage(); + page.setCurrent(1); + page.setSearchCount(false); + page.setSize(Integer.MAX_VALUE); + OrderSampleListRequest request = new OrderSampleListRequest(); + request.setCustomerId(String.valueOf(customerId)); + Page multiItemSampleListResponsePage = customerSampleService.listPageByOrder(page, request); + List records = multiItemSampleListResponsePage.getRecords(); + resultList = ConvertUtils.sourceToTarget(records, ReadSampleDTO.class); } else if(sceneNo.equals("3")){ Page page = PageFactory.defaultPage(); page.setCurrent(1);