diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index edeb2db..f6d2f86 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -98,7 +98,7 @@ // TODO: 2024/4/9 刘翔:打印、批量打印 @ApiOperation("批量打印") @PostMapping("/batchPrint") - public void batchPrint(@RequestBody @Valid List idDTOList,HttpServletResponse response) { + public void batchPrint(@RequestBody @Valid List idDTOList,HttpServletResponse response)throws Exception { Assert.isFalse(CollectionUtils.isEmpty(idDTOList), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index edeb2db..f6d2f86 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -98,7 +98,7 @@ // TODO: 2024/4/9 刘翔:打印、批量打印 @ApiOperation("批量打印") @PostMapping("/batchPrint") - public void batchPrint(@RequestBody @Valid List idDTOList,HttpServletResponse response) { + public void batchPrint(@RequestBody @Valid List idDTOList,HttpServletResponse response)throws Exception { Assert.isFalse(CollectionUtils.isEmpty(idDTOList), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessInterchangeInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessInterchangeInfoServiceImpl.java index 9abb2f5..6c0f649 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessInterchangeInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessInterchangeInfoServiceImpl.java @@ -309,8 +309,6 @@ List sampleList = orderSampleRelationMapper.selectSampleListForInterChange(interchangeInfo.getId(), interchangeInfo.getOrderId()); List gatherSampleList = getGatherDataList(sampleList); interchangeInfo.setSampleList(gatherSampleList); - User user = permissionContext.getUserService().getById(interchangeInfo.getDeliverer()); - interchangeInfo.setDeliverer(ObjectUtils.isEmpty(user) ? "" : user.getName()); if (StringUtils.isNotEmpty(interchangeInfo.getRequireOverTime())) { DateTime dateTime = DateUtil.parseDate(interchangeInfo.getRequireOverTime()); interchangeInfo.setRequireOverTime(DateUtil.format(dateTime, "yyyy年MM月dd日")); @@ -335,12 +333,15 @@ * @param response */ @Override - public void batchPrint(List idDTOList, HttpServletResponse response) { + public void batchPrint(List idDTOList, HttpServletResponse response) throws Exception{ List idList = idDTOList.stream().map(IdDTO::getId).collect(Collectors.toList()); List interchangeInfoList = this.baseMapper.selectBatchIds(idList); if (CollectionUtils.isEmpty(interchangeInfoList)) { return; } + for (BizBusinessInterchangeInfo sample : interchangeInfoList) { + DictCodeUtils.convertDictCodeToName(sample); + } //创建线程组 int corePoolSize = interchangeInfoList.size(); if (interchangeInfoList.size() > 10) { @@ -361,8 +362,6 @@ List sampleList = orderSampleRelationMapper.selectSampleListForInterChange(interchangeInfo.getId(), interchangeInfo.getOrderId()); List gatherSampleList = getGatherDataList(sampleList); interchangeInfo.setSampleList(gatherSampleList); - User user = permissionContext.getUserService().getById(interchangeInfo.getDeliverer()); - interchangeInfo.setDeliverer(ObjectUtils.isEmpty(user) ? "" : user.getName()); if (StringUtils.isNotEmpty(interchangeInfo.getRequireOverTime())) { DateTime dateTime = DateUtil.parseDate(interchangeInfo.getRequireOverTime()); interchangeInfo.setRequireOverTime(DateUtil.format(dateTime, "yyyy年MM月dd日")); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java index edeb2db..f6d2f86 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessInterchangeController.java @@ -98,7 +98,7 @@ // TODO: 2024/4/9 刘翔:打印、批量打印 @ApiOperation("批量打印") @PostMapping("/batchPrint") - public void batchPrint(@RequestBody @Valid List idDTOList,HttpServletResponse response) { + public void batchPrint(@RequestBody @Valid List idDTOList,HttpServletResponse response)throws Exception { Assert.isFalse(CollectionUtils.isEmpty(idDTOList), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessInterchangeInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessInterchangeInfoServiceImpl.java index 9abb2f5..6c0f649 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessInterchangeInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessInterchangeInfoServiceImpl.java @@ -309,8 +309,6 @@ List sampleList = orderSampleRelationMapper.selectSampleListForInterChange(interchangeInfo.getId(), interchangeInfo.getOrderId()); List gatherSampleList = getGatherDataList(sampleList); interchangeInfo.setSampleList(gatherSampleList); - User user = permissionContext.getUserService().getById(interchangeInfo.getDeliverer()); - interchangeInfo.setDeliverer(ObjectUtils.isEmpty(user) ? "" : user.getName()); if (StringUtils.isNotEmpty(interchangeInfo.getRequireOverTime())) { DateTime dateTime = DateUtil.parseDate(interchangeInfo.getRequireOverTime()); interchangeInfo.setRequireOverTime(DateUtil.format(dateTime, "yyyy年MM月dd日")); @@ -335,12 +333,15 @@ * @param response */ @Override - public void batchPrint(List idDTOList, HttpServletResponse response) { + public void batchPrint(List idDTOList, HttpServletResponse response) throws Exception{ List idList = idDTOList.stream().map(IdDTO::getId).collect(Collectors.toList()); List interchangeInfoList = this.baseMapper.selectBatchIds(idList); if (CollectionUtils.isEmpty(interchangeInfoList)) { return; } + for (BizBusinessInterchangeInfo sample : interchangeInfoList) { + DictCodeUtils.convertDictCodeToName(sample); + } //创建线程组 int corePoolSize = interchangeInfoList.size(); if (interchangeInfoList.size() > 10) { @@ -361,8 +362,6 @@ List sampleList = orderSampleRelationMapper.selectSampleListForInterChange(interchangeInfo.getId(), interchangeInfo.getOrderId()); List gatherSampleList = getGatherDataList(sampleList); interchangeInfo.setSampleList(gatherSampleList); - User user = permissionContext.getUserService().getById(interchangeInfo.getDeliverer()); - interchangeInfo.setDeliverer(ObjectUtils.isEmpty(user) ? "" : user.getName()); if (StringUtils.isNotEmpty(interchangeInfo.getRequireOverTime())) { DateTime dateTime = DateUtil.parseDate(interchangeInfo.getRequireOverTime()); interchangeInfo.setRequireOverTime(DateUtil.format(dateTime, "yyyy年MM月dd日")); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessInterchangeInfoService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessInterchangeInfoService.java index 00b03bd..5252ea4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessInterchangeInfoService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBizBusinessInterchangeInfoService.java @@ -39,5 +39,5 @@ void exportFile(ExportDTO exportDTO, HttpServletResponse response); - void batchPrint(List idDTOList, HttpServletResponse response); + void batchPrint(List idDTOList, HttpServletResponse response)throws Exception; }