From 7f0ca1c767db1aab2e47dd344ddcee90c22c074a Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Fri, 8 Aug 2025 13:08:28 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=B5=81=E7=A8=8B=E8=B0=83=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/vo/storeCertificate/StoreCertStepResVO.java | 2 ++ .../service/impl/StoreCertificateServiceImpl.java | 13 ++++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertStepResVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertStepResVO.java index b3978baaa..1c15fbbbb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertStepResVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertStepResVO.java @@ -51,6 +51,8 @@ public class StoreCertStepResVO { private String facAddress; @ApiModelProperty(value = "生产规模") private Integer prodScale; + @ApiModelProperty(value = "拒绝理由") + private String rejectReason; } @Data diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java index 5c0e752fb..77e2406a9 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreCertificateServiceImpl.java @@ -157,7 +157,18 @@ public class StoreCertificateServiceImpl implements IStoreCertificateService { } Store store = this.storeMapper.selectOne(new LambdaQueryWrapper() .eq(Store::getId, storeId).eq(Store::getDelFlag, Constants.UNDELETED)); - return new StoreCertStepResDTO().setStoreCert(BeanUtil.toBean(storeCert, StoreCertStepResDTO.SCSStoreCertDTO.class)) + // 获取认证的证照信息 + List fileIdList = Arrays.asList(storeCert.getIdCardFaceFileId(), storeCert.getIdCardEmblemFileId(), storeCert.getLicenseFileId()); + List fileList = Optional.ofNullable(this.fileMapper.selectList(new LambdaQueryWrapper() + .eq(SysFile::getDelFlag, Constants.UNDELETED).in(SysFile::getId, fileIdList))) + .orElseThrow(() -> new ServiceException("文件不存在!", HttpStatus.ERROR)); + // 档口认证所有的文件列表 + List fileDTOList = fileList.stream().map(x -> BeanUtil.toBean(x, StoreCertStepResDTO.SCStoreFileDTO.class) + .setFileType(Objects.equals(x.getId(), storeCert.getIdCardFaceFileId()) ? FileType.ID_CARD_FACE.getValue() : + (Objects.equals(x.getId(), storeCert.getIdCardEmblemFileId()) + ? FileType.ID_CARD_EMBLEM.getValue() : FileType.BUSINESS_LICENSE.getValue()))) + .collect(Collectors.toList()); + return new StoreCertStepResDTO().setStoreCert(BeanUtil.toBean(storeCert, StoreCertStepResDTO.SCSStoreCertDTO.class).setFileList(fileDTOList)) .setStoreBasic(BeanUtil.toBean(store, StoreCertStepResDTO.SCSStoreBasicDTO.class)); }