diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java index 6ef74614..0c58fb39 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/service/impl/OcrTaskchildPictureServiceImpl.java @@ -693,6 +693,10 @@ public class OcrTaskchildPictureServiceImpl extends BaseServiceImpl collect = taskChildPictures.stream().skip((pageNo - 1) * pageSize).limit(pageSize).collect(Collectors.toList()); + for (OcrTaskChildPictureVo ocrTaskChildPictureVo : collect) { + OcrPictureInfo one = pictureInfoService.getOne(new LambdaQueryWrapper().eq(OcrPictureInfo::getPictureId, ocrTaskChildPictureVo.getId())); + ocrTaskChildPictureVo.setPictureInfo(one); + } objectPage.setRecords(collect); objectPage.setTotal(taskChildPictures.size()); return objectPage; diff --git a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskChildPictureVo.java b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskChildPictureVo.java index cdea78da..b869cdfb 100644 --- a/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskChildPictureVo.java +++ b/jyjz-system/jyjz-system-oa/src/main/java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskChildPictureVo.java @@ -168,4 +168,6 @@ public class OcrTaskChildPictureVo implements java.io.Serializable { @ApiModelProperty(value = "拍照时间") private String photoDateTimestamp; + private OcrPictureInfo pictureInfo; + }