diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java index c37446f..147a643 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java @@ -59,9 +59,10 @@ * 文件流下载（minio） */ @ApiOperation("文件流下载") - @PostMapping("/download/stream/{fileName}") + @PostMapping("/download/stream") + @CrossOrigin @ResponseBody - public void upload(@PathVariable(name = "fileName") String fileName, HttpServletResponse response) { + public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) { minioUtil.downloadStream(fileName, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java index c37446f..147a643 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java @@ -59,9 +59,10 @@ * 文件流下载（minio） */ @ApiOperation("文件流下载") - @PostMapping("/download/stream/{fileName}") + @PostMapping("/download/stream") + @CrossOrigin @ResponseBody - public void upload(@PathVariable(name = "fileName") String fileName, HttpServletResponse response) { + public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) { minioUtil.downloadStream(fileName, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java index d59e37d..ce27096 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java @@ -35,4 +35,6 @@ public ReturnDTO> sampleMonitor(Page page) { return ReturnUtil.success(super.packForBT(workbenchService.sampleMonitor(page))); } + + } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java index c37446f..147a643 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java @@ -59,9 +59,10 @@ * 文件流下载（minio） */ @ApiOperation("文件流下载") - @PostMapping("/download/stream/{fileName}") + @PostMapping("/download/stream") + @CrossOrigin @ResponseBody - public void upload(@PathVariable(name = "fileName") String fileName, HttpServletResponse response) { + public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) { minioUtil.downloadStream(fileName, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java index d59e37d..ce27096 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java @@ -35,4 +35,6 @@ public ReturnDTO> sampleMonitor(Page page) { return ReturnUtil.success(super.packForBT(workbenchService.sampleMonitor(page))); } + + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a1b9888..f3bfe90 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -303,7 +303,7 @@ JOIN customer_sample_info csi ON csi.id = bosr.sample_id WHERE bo.is_del = 0 AND bosr.measure_type = 1 - AND bosr.sample_status = #{request.sampleStatus} + AND bosr.sample_status = #{status} ORDER BY bosr.create_time DESC diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java index c37446f..147a643 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java @@ -59,9 +59,10 @@ * 文件流下载（minio） */ @ApiOperation("文件流下载") - @PostMapping("/download/stream/{fileName}") + @PostMapping("/download/stream") + @CrossOrigin @ResponseBody - public void upload(@PathVariable(name = "fileName") String fileName, HttpServletResponse response) { + public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) { minioUtil.downloadStream(fileName, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java index d59e37d..ce27096 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java @@ -35,4 +35,6 @@ public ReturnDTO> sampleMonitor(Page page) { return ReturnUtil.success(super.packForBT(workbenchService.sampleMonitor(page))); } + + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a1b9888..f3bfe90 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -303,7 +303,7 @@ JOIN customer_sample_info csi ON csi.id = bosr.sample_id WHERE bo.is_del = 0 AND bosr.measure_type = 1 - AND bosr.sample_status = #{request.sampleStatus} + AND bosr.sample_status = #{status} ORDER BY bosr.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 0e357fa..fe73951 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -57,7 +57,7 @@ and mpi.item_name like concat('%', #{request.priceItem}, '%') - and t1.id in + and mp.id in #{id} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java index c37446f..147a643 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java @@ -59,9 +59,10 @@ * 文件流下载（minio） */ @ApiOperation("文件流下载") - @PostMapping("/download/stream/{fileName}") + @PostMapping("/download/stream") + @CrossOrigin @ResponseBody - public void upload(@PathVariable(name = "fileName") String fileName, HttpServletResponse response) { + public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) { minioUtil.downloadStream(fileName, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java index d59e37d..ce27096 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java @@ -35,4 +35,6 @@ public ReturnDTO> sampleMonitor(Page page) { return ReturnUtil.success(super.packForBT(workbenchService.sampleMonitor(page))); } + + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a1b9888..f3bfe90 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -303,7 +303,7 @@ JOIN customer_sample_info csi ON csi.id = bosr.sample_id WHERE bo.is_del = 0 AND bosr.measure_type = 1 - AND bosr.sample_status = #{request.sampleStatus} + AND bosr.sample_status = #{status} ORDER BY bosr.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 0e357fa..fe73951 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -57,7 +57,7 @@ and mpi.item_name like concat('%', #{request.priceItem}, '%') - and t1.id in + and mp.id in #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java index f9e2b4b..2d3b431 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -43,7 +43,7 @@ private String priceName; @TableField("check_type") - @ExcelProperty(value = "校验类型") +// @ExcelProperty(value = "校验类型") @ApiModelProperty(value = "校验类型-字典value", dataType = "String") private String checkType; @@ -88,7 +88,7 @@ private String priceDescription; @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限") +// @ExcelProperty(value = "业务员折扣权限") @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") private String operatorDiscountPermission; @@ -98,7 +98,7 @@ private String operatorDiscountPermissionName; @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限") +// @ExcelProperty(value = "负责人折扣权限") @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") private String directorDiscountPermission; @@ -116,7 +116,7 @@ private Integer isDel; @TableField("model") - @ExcelProperty(value = "型号",order = 3) +// @ExcelProperty(value = "型号",order = 3) @ApiModelProperty(value = "型号", dataType = "String") private String model; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java index c37446f..147a643 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java @@ -59,9 +59,10 @@ * 文件流下载（minio） */ @ApiOperation("文件流下载") - @PostMapping("/download/stream/{fileName}") + @PostMapping("/download/stream") + @CrossOrigin @ResponseBody - public void upload(@PathVariable(name = "fileName") String fileName, HttpServletResponse response) { + public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) { minioUtil.downloadStream(fileName, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java index d59e37d..ce27096 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java @@ -35,4 +35,6 @@ public ReturnDTO> sampleMonitor(Page page) { return ReturnUtil.success(super.packForBT(workbenchService.sampleMonitor(page))); } + + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a1b9888..f3bfe90 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -303,7 +303,7 @@ JOIN customer_sample_info csi ON csi.id = bosr.sample_id WHERE bo.is_del = 0 AND bosr.measure_type = 1 - AND bosr.sample_status = #{request.sampleStatus} + AND bosr.sample_status = #{status} ORDER BY bosr.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 0e357fa..fe73951 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -57,7 +57,7 @@ and mpi.item_name like concat('%', #{request.priceItem}, '%') - and t1.id in + and mp.id in #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java index f9e2b4b..2d3b431 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -43,7 +43,7 @@ private String priceName; @TableField("check_type") - @ExcelProperty(value = "校验类型") +// @ExcelProperty(value = "校验类型") @ApiModelProperty(value = "校验类型-字典value", dataType = "String") private String checkType; @@ -88,7 +88,7 @@ private String priceDescription; @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限") +// @ExcelProperty(value = "业务员折扣权限") @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") private String operatorDiscountPermission; @@ -98,7 +98,7 @@ private String operatorDiscountPermissionName; @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限") +// @ExcelProperty(value = "负责人折扣权限") @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") private String directorDiscountPermission; @@ -116,7 +116,7 @@ private Integer isDel; @TableField("model") - @ExcelProperty(value = "型号",order = 3) +// @ExcelProperty(value = "型号",order = 3) @ApiModelProperty(value = "型号", dataType = "String") private String model; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessWorkbenchServiceImpl.java index d5854fa..3fa85f4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessWorkbenchServiceImpl.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.business.labExecutive.MeasureProcessDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; +import com.casic.missiles.enums.business.MeasureStatusEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; @@ -33,7 +34,6 @@ @Override public Page sampleMonitor(Page page) { Page sampleList = orderSampleRelationMapper.selectSampleMonitorListByStatus(page, SampleStatusEnum.IN_MEASURE); - //获取当前检测实验室及下一检测实验室 List records = sampleList.getRecords(); if(CollectionUtils.isEmpty(records)){ return new Page<>(); @@ -47,9 +47,9 @@ return; } List statusList = new ArrayList<>(); - statusList.add(SampleStatusEnum.TO_HANDOUT); - statusList.add(SampleStatusEnum.IN_MEASURE); - statusList.add(SampleStatusEnum.MEASURE_COMPLETE); + statusList.add(MeasureStatusEnum.TO_ALLOCATE); + statusList.add(MeasureStatusEnum.TO_MEASURE); + statusList.add(MeasureStatusEnum.IN_MEASURE); measureProcessDTOS.forEach(measureProcessDTO -> { if(statusList.contains(measureProcessDTO.getMeasureStatus())){ sample.setCurrentSegment(measureProcessDTO.getMeasureSegment()); @@ -57,9 +57,19 @@ return; } }); - MeasureProcessDTO measureProcessDTO = measureProcessDTOS.stream().filter(s -> sample.getCurrentNo().equals(s.getMeasureSequence())).collect(Collectors.toList()).get(0); - if(Objects.nonNull(measureProcessDTO)){ - sample.setNextSegment(measureProcessDTO.getMeasureSegment()); + if(Objects.isNull(sample.getCurrentSegment())){ + return; + } + //获取当前检测实验室及下一检测实验室 + List collect = measureProcessDTOS.stream().filter(s -> { + if (Objects.isNull(s.getMeasureSequence()) || Objects.isNull(sample.getCurrentNo())) { + return false; + } + Integer nextNo = sample.getCurrentNo() + 1; + return nextNo.equals(s.getMeasureSequence()); + }).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(collect)){ + sample.setNextSegment(collect.get(0).getMeasureSegment()); } }); return sampleList; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java index c37446f..147a643 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/MinioFileController.java @@ -59,9 +59,10 @@ * 文件流下载（minio） */ @ApiOperation("文件流下载") - @PostMapping("/download/stream/{fileName}") + @PostMapping("/download/stream") + @CrossOrigin @ResponseBody - public void upload(@PathVariable(name = "fileName") String fileName, HttpServletResponse response) { + public void upload(@RequestParam(name = "fileName") String fileName, HttpServletResponse response) { minioUtil.downloadStream(fileName, response); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java index d59e37d..ce27096 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessWorkbenchController.java @@ -35,4 +35,6 @@ public ReturnDTO> sampleMonitor(Page page) { return ReturnUtil.success(super.packForBT(workbenchService.sampleMonitor(page))); } + + } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml index a1b9888..f3bfe90 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessOrderSampleRelationMapper.xml @@ -303,7 +303,7 @@ JOIN customer_sample_info csi ON csi.id = bosr.sample_id WHERE bo.is_del = 0 AND bosr.measure_type = 1 - AND bosr.sample_status = #{request.sampleStatus} + AND bosr.sample_status = #{status} ORDER BY bosr.create_time DESC diff --git a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml index 0e357fa..fe73951 100644 --- a/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/meter/MeterPriceMapper.xml @@ -57,7 +57,7 @@ and mpi.item_name like concat('%', #{request.priceItem}, '%') - and t1.id in + and mp.id in #{id} diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java index f9e2b4b..2d3b431 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/meter/MeterPrice.java @@ -43,7 +43,7 @@ private String priceName; @TableField("check_type") - @ExcelProperty(value = "校验类型") +// @ExcelProperty(value = "校验类型") @ApiModelProperty(value = "校验类型-字典value", dataType = "String") private String checkType; @@ -88,7 +88,7 @@ private String priceDescription; @TableField("operator_discount_permission") - @ExcelProperty(value = "业务员折扣权限") +// @ExcelProperty(value = "业务员折扣权限") @ApiModelProperty(value = "业务员折扣权限-字典value", dataType = "String") private String operatorDiscountPermission; @@ -98,7 +98,7 @@ private String operatorDiscountPermissionName; @TableField("director_discount_permission") - @ExcelProperty(value = "负责人折扣权限") +// @ExcelProperty(value = "负责人折扣权限") @ApiModelProperty(value = "负责人折扣权限-字典value", dataType = "String") private String directorDiscountPermission; @@ -116,7 +116,7 @@ private Integer isDel; @TableField("model") - @ExcelProperty(value = "型号",order = 3) +// @ExcelProperty(value = "型号",order = 3) @ApiModelProperty(value = "型号", dataType = "String") private String model; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessWorkbenchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessWorkbenchServiceImpl.java index d5854fa..3fa85f4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessWorkbenchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessWorkbenchServiceImpl.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.dto.business.labExecutive.MeasureProcessDTO; import com.casic.missiles.dto.business.workbench.SampleMonitorResponse; +import com.casic.missiles.enums.business.MeasureStatusEnum; import com.casic.missiles.enums.sample.SampleStatusEnum; import com.casic.missiles.mapper.business.BusinessLabExecutiveInfoMapper; import com.casic.missiles.mapper.business.BusinessOrderSampleRelationMapper; @@ -33,7 +34,6 @@ @Override public Page sampleMonitor(Page page) { Page sampleList = orderSampleRelationMapper.selectSampleMonitorListByStatus(page, SampleStatusEnum.IN_MEASURE); - //获取当前检测实验室及下一检测实验室 List records = sampleList.getRecords(); if(CollectionUtils.isEmpty(records)){ return new Page<>(); @@ -47,9 +47,9 @@ return; } List statusList = new ArrayList<>(); - statusList.add(SampleStatusEnum.TO_HANDOUT); - statusList.add(SampleStatusEnum.IN_MEASURE); - statusList.add(SampleStatusEnum.MEASURE_COMPLETE); + statusList.add(MeasureStatusEnum.TO_ALLOCATE); + statusList.add(MeasureStatusEnum.TO_MEASURE); + statusList.add(MeasureStatusEnum.IN_MEASURE); measureProcessDTOS.forEach(measureProcessDTO -> { if(statusList.contains(measureProcessDTO.getMeasureStatus())){ sample.setCurrentSegment(measureProcessDTO.getMeasureSegment()); @@ -57,9 +57,19 @@ return; } }); - MeasureProcessDTO measureProcessDTO = measureProcessDTOS.stream().filter(s -> sample.getCurrentNo().equals(s.getMeasureSequence())).collect(Collectors.toList()).get(0); - if(Objects.nonNull(measureProcessDTO)){ - sample.setNextSegment(measureProcessDTO.getMeasureSegment()); + if(Objects.isNull(sample.getCurrentSegment())){ + return; + } + //获取当前检测实验室及下一检测实验室 + List collect = measureProcessDTOS.stream().filter(s -> { + if (Objects.isNull(s.getMeasureSequence()) || Objects.isNull(sample.getCurrentNo())) { + return false; + } + Integer nextNo = sample.getCurrentNo() + 1; + return nextNo.equals(s.getMeasureSequence()); + }).collect(Collectors.toList()); + if(!CollectionUtils.isEmpty(collect)){ + sample.setNextSegment(collect.get(0).getMeasureSegment()); } }); return sampleList; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java index ab30ff5..d9c0055 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/meter/MeterPriceServiceImpl.java @@ -126,7 +126,7 @@ if(!CollectionUtils.isEmpty(meterPriceRequest.getIds())){ MeterPriceRequest request = new MeterPriceRequest(); request.setIds(meterPriceRequest.getIds()); - meterPrices = meterPriceMapper.queryPriceList(request); + meterPrices = supplementList(meterPriceMapper.queryPriceList(request)); }else{ meterPrices = supplementList(meterPriceMapper.queryPriceList(meterPriceRequest)); }