diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 57949ea..bc7ba11 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -71,11 +71,11 @@ */ @ApiOperation("( 回退、收入、归还、无需检测 按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - return bizDispatchService.statusChange(deviceReceiveDTO); + return bizDispatchService.batchStatusChange(deviceReceiveDTOList); } @ApiOperation("设备批量改变状态") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 57949ea..bc7ba11 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -71,11 +71,11 @@ */ @ApiOperation("( 回退、收入、归还、无需检测 按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - return bizDispatchService.statusChange(deviceReceiveDTO); + return bizDispatchService.batchStatusChange(deviceReceiveDTOList); } @ApiOperation("设备批量改变状态") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index fd4979c..c127c2f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -166,21 +166,37 @@ */ @Override @Transactional - public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) { - //涉及实际送达时间，需判断前置为待收入转入的 - boolean incomeStatusFlag = incomeStatusChange(deviceStatusChangeDTO); - //涉及归还时间 - boolean giveBackStatusFlag = giveBackStatusChange(deviceStatusChangeDTO); - //完成状态 - toGiveBackStatusChange(deviceStatusChangeDTO); - //状态变更 - Integer updateFlag = this.statusChangeUpdator(deviceStatusChangeDTO, false); - if (updateFlag > 0 && incomeStatusFlag && giveBackStatusFlag) { + public ReturnDTO batchStatusChange(List deviceReceiveDTOList) { + Boolean updateFlag = true; + for (DeviceStatusChangeDTO deviceStatusChangeDTO : deviceReceiveDTOList) { + updateFlag &= statusChange(deviceStatusChangeDTO); + } + if (updateFlag) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 根据sampleId，orderId,进行状态更新 + */ + @Transactional + public Boolean statusChange(DeviceStatusChangeDTO deviceReceiveDTO) { + //涉及实际送达时间，需判断前置为待收入转入的 + boolean incomeStatusFlag = incomeStatusChange(deviceReceiveDTO); + //涉及归还时间 + boolean giveBackStatusFlag = giveBackStatusChange(deviceReceiveDTO); + //完成状态 + toGiveBackStatusChange(deviceReceiveDTO); + //状态变更 + Integer updateFlag = this.statusChangeUpdator(deviceReceiveDTO, false); + if (updateFlag > 0 && incomeStatusFlag && giveBackStatusFlag) { + return true; + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override @Transactional public ReturnDTO statusBatchChange(DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { @@ -191,7 +207,7 @@ }); deviceStatusChangeDTO.setStatus(deviceBatchStatusChangeDTO.getStatus()); deviceStatusChangeDTO.setReason(deviceBatchStatusChangeDTO.getReason()); - batchUpdateFlag &= statusChange(deviceStatusChangeDTO).getCode() == 200; + batchUpdateFlag &= statusChange(deviceStatusChangeDTO); } if (batchUpdateFlag) { return ReturnUtil.success(); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 57949ea..bc7ba11 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -71,11 +71,11 @@ */ @ApiOperation("( 回退、收入、归还、无需检测 按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - return bizDispatchService.statusChange(deviceReceiveDTO); + return bizDispatchService.batchStatusChange(deviceReceiveDTOList); } @ApiOperation("设备批量改变状态") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index fd4979c..c127c2f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -166,21 +166,37 @@ */ @Override @Transactional - public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) { - //涉及实际送达时间，需判断前置为待收入转入的 - boolean incomeStatusFlag = incomeStatusChange(deviceStatusChangeDTO); - //涉及归还时间 - boolean giveBackStatusFlag = giveBackStatusChange(deviceStatusChangeDTO); - //完成状态 - toGiveBackStatusChange(deviceStatusChangeDTO); - //状态变更 - Integer updateFlag = this.statusChangeUpdator(deviceStatusChangeDTO, false); - if (updateFlag > 0 && incomeStatusFlag && giveBackStatusFlag) { + public ReturnDTO batchStatusChange(List deviceReceiveDTOList) { + Boolean updateFlag = true; + for (DeviceStatusChangeDTO deviceStatusChangeDTO : deviceReceiveDTOList) { + updateFlag &= statusChange(deviceStatusChangeDTO); + } + if (updateFlag) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 根据sampleId，orderId,进行状态更新 + */ + @Transactional + public Boolean statusChange(DeviceStatusChangeDTO deviceReceiveDTO) { + //涉及实际送达时间，需判断前置为待收入转入的 + boolean incomeStatusFlag = incomeStatusChange(deviceReceiveDTO); + //涉及归还时间 + boolean giveBackStatusFlag = giveBackStatusChange(deviceReceiveDTO); + //完成状态 + toGiveBackStatusChange(deviceReceiveDTO); + //状态变更 + Integer updateFlag = this.statusChangeUpdator(deviceReceiveDTO, false); + if (updateFlag > 0 && incomeStatusFlag && giveBackStatusFlag) { + return true; + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override @Transactional public ReturnDTO statusBatchChange(DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { @@ -191,7 +207,7 @@ }); deviceStatusChangeDTO.setStatus(deviceBatchStatusChangeDTO.getStatus()); deviceStatusChangeDTO.setReason(deviceBatchStatusChangeDTO.getReason()); - batchUpdateFlag &= statusChange(deviceStatusChangeDTO).getCode() == 200; + batchUpdateFlag &= statusChange(deviceStatusChangeDTO); } if (batchUpdateFlag) { return ReturnUtil.success(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java index 94fa462..1d38667 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java @@ -16,7 +16,7 @@ void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response); - ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO); + ReturnDTO batchStatusChange(List deviceReceiveDTOList); ReturnDTO statusBatchChange(DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java index 57949ea..bc7ba11 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessDispatchController.java @@ -71,11 +71,11 @@ */ @ApiOperation("( 回退、收入、归还、无需检测 按钮)") @PostMapping("/status/change") - public ReturnDTO statusChange(@RequestBody @Valid DeviceStatusChangeDTO deviceReceiveDTO) { - Assert.isFalse(Objects.isNull(deviceReceiveDTO.getOrderId()) || Objects.isNull(deviceReceiveDTO.getSampleId()), () -> { - throw new BusinessException(BusinessExceptionEnum.ID_NULL); + public ReturnDTO statusChange(@RequestBody @Valid List deviceReceiveDTOList, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); }); - return bizDispatchService.statusChange(deviceReceiveDTO); + return bizDispatchService.batchStatusChange(deviceReceiveDTOList); } @ApiOperation("设备批量改变状态") diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java index fd4979c..c127c2f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/IBusinessDispatchServiceImpl.java @@ -166,21 +166,37 @@ */ @Override @Transactional - public ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO) { - //涉及实际送达时间，需判断前置为待收入转入的 - boolean incomeStatusFlag = incomeStatusChange(deviceStatusChangeDTO); - //涉及归还时间 - boolean giveBackStatusFlag = giveBackStatusChange(deviceStatusChangeDTO); - //完成状态 - toGiveBackStatusChange(deviceStatusChangeDTO); - //状态变更 - Integer updateFlag = this.statusChangeUpdator(deviceStatusChangeDTO, false); - if (updateFlag > 0 && incomeStatusFlag && giveBackStatusFlag) { + public ReturnDTO batchStatusChange(List deviceReceiveDTOList) { + Boolean updateFlag = true; + for (DeviceStatusChangeDTO deviceStatusChangeDTO : deviceReceiveDTOList) { + updateFlag &= statusChange(deviceStatusChangeDTO); + } + if (updateFlag) { return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + /** + * 根据sampleId，orderId,进行状态更新 + */ + @Transactional + public Boolean statusChange(DeviceStatusChangeDTO deviceReceiveDTO) { + //涉及实际送达时间，需判断前置为待收入转入的 + boolean incomeStatusFlag = incomeStatusChange(deviceReceiveDTO); + //涉及归还时间 + boolean giveBackStatusFlag = giveBackStatusChange(deviceReceiveDTO); + //完成状态 + toGiveBackStatusChange(deviceReceiveDTO); + //状态变更 + Integer updateFlag = this.statusChangeUpdator(deviceReceiveDTO, false); + if (updateFlag > 0 && incomeStatusFlag && giveBackStatusFlag) { + return true; + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override @Transactional public ReturnDTO statusBatchChange(DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO) { @@ -191,7 +207,7 @@ }); deviceStatusChangeDTO.setStatus(deviceBatchStatusChangeDTO.getStatus()); deviceStatusChangeDTO.setReason(deviceBatchStatusChangeDTO.getReason()); - batchUpdateFlag &= statusChange(deviceStatusChangeDTO).getCode() == 200; + batchUpdateFlag &= statusChange(deviceStatusChangeDTO); } if (batchUpdateFlag) { return ReturnUtil.success(); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java index 94fa462..1d38667 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessDispatchService.java @@ -16,7 +16,7 @@ void exportSampleDispatchList(DeviceDispatchDTO request, HttpServletResponse response); - ReturnDTO statusChange(DeviceStatusChangeDTO deviceStatusChangeDTO); + ReturnDTO batchStatusChange(List deviceReceiveDTOList); ReturnDTO statusBatchChange(DeviceBatchStatusChangeDTO deviceBatchStatusChangeDTO); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java index 85df50d..372d23d 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/listeners/register/FilePrintRegisterUtils.java @@ -475,7 +475,6 @@ // // word文档内容关键字 // FilePrintRegisterUtils addStampUtils = new FilePrintRegisterUtils(); // List electronicSealList = new ArrayList(11); -// // ElectronicImage electronicImage = defaultElectronicSignName("批准人"); // electronicImage.setElectronicSealImageUrl(stampNameImgUr); // electronicSealList.add(electronicImage);