From 046380375067402fa0607989f19d8ee8a5bf137f Mon Sep 17 00:00:00 2001 From: hxh Date: Fri, 5 Jul 2024 11:58:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yxgh/df/service/DfRecordService.java | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index 958bc720..30fe2881 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -152,26 +152,28 @@ public class DfRecordService extends BaseService { DfRecord record = this.getBaseMapper().selectById(id); if (record != null) { DfRecordDetailDto dto = BeanCopyUtils.copy(record, DfRecordDetailDto.class); - Wrapper wp = Wrappers.lambdaQuery().eq(DfRecordItem::getRecordId, id); - List items = recordItemService.list(wp); - if (CollectionUtil.isNotEmpty(items) && dto != null) { + if (dto != null) { DfCheckingLine line = checkingLineMapper.selectById(record.getLineId()); dto.setEntries(Optional.ofNullable(line).map(DfCheckingLine::getPoints).orElse("")); dto.setCreateName(userService.userName(dto.getCreateUid())); - dto.setItems(StreamUtils.toList(items, r -> { - DfRecordItemDto itemDto = BeanCopyUtils.copy(r, DfRecordItemDto.class); - if (itemDto != null) { - itemDto.setParts(Arrays.stream(StringUtils.split(r.getParts(), PART_SEPARATOR)) - .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList())); - DfRecordItem.Doc doc = r.getDocObj(); - if (doc != null) { - itemDto.setProblemImages(doc.getProblemImages()); - itemDto.setHandleImages(doc.getHandleImages()); - itemDto.setProblemVoices(doc.getProblemVoices()); + Wrapper wp = Wrappers.lambdaQuery().eq(DfRecordItem::getRecordId, id); + List items = recordItemService.list(wp); + if (CollectionUtil.isNotEmpty(items)) { + dto.setItems(StreamUtils.toList(items, r -> { + DfRecordItemDto itemDto = BeanCopyUtils.copy(r, DfRecordItemDto.class); + if (itemDto != null) { + itemDto.setParts(Arrays.stream(StringUtils.split(r.getParts(), PART_SEPARATOR)) + .sorted(Comparator.comparingInt(String::length)).collect(Collectors.toList())); + DfRecordItem.Doc doc = r.getDocObj(); + if (doc != null) { + itemDto.setProblemImages(doc.getProblemImages()); + itemDto.setHandleImages(doc.getHandleImages()); + itemDto.setProblemVoices(doc.getProblemVoices()); + } } - } - return itemDto; - })); + return itemDto; + })); + } if (line != null && StringUtils.isNotBlank(line.getXcId())) { dto.setAllItem((long) dfCheckingItemMapper.selectCount(Wrappers.lambdaQuery().eq(DfCheckingItem::getXcId, line.getXcId()))); }