From 425ac204f6440b180e09b54fe47b8de8dd3b3ccf Mon Sep 17 00:00:00 2001 From: sunchenliang <2532527871@qq.com> Date: Sun, 31 Mar 2024 21:50:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9B=B8=E4=BC=BC=E5=BA=A6=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocr/service/impl/OcrTaskchildPictureServiceImpl.java | 4 ++++ .../java/cn/jyjz/xiaoyao/ocr/vo/OcrTaskChildPictureVo.java | 2 ++ 2 files changed, 6 insertions(+) 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; + }