From 1b074eb4a7415374f593e2bcbed3f9211bb93944 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Mon, 4 Dec 2023 14:46:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81):=20?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/fb/entity/ProcessFbConsultationList.java | 5 +++++ .../consultation/service/impl/ConsultationServiceImpl.java | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java index 315eca46..9d6d5ca5 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/entity/ProcessFbConsultationList.java @@ -84,6 +84,11 @@ public class ProcessFbConsultationList implements Serializable { @Excel(name = "依据材料", width = 15) @ApiModelProperty(value = "依据材料") private java.lang.String basisFile; + /**依据材料名称*/ + @Excel(name = "依据材料名称", width = 15) + @ApiModelProperty(value = "依据材料名称") + @TableField(exist = false) + private java.lang.String basisFileName; /**设计工程师名称*/ @Excel(name = "设计工程师名称", width = 15) @ApiModelProperty(value = "设计工程师名称") diff --git a/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java index 458fc985..2faf16dd 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/consultation/service/impl/ConsultationServiceImpl.java @@ -104,6 +104,13 @@ public class ConsultationServiceImpl implements IConsultationService { if (!sysDeparts.isEmpty()){ consultationList.setDepart(sysDeparts.stream().map(SysDepart::getDepartName).collect(Collectors.joining(","))); } + + if (StringUtils.isNotBlank(consultationList.getBasisFile())){ + // 依据材料 + List fileIds = Arrays.asList(consultationList.getBasisFile().split(",")); + List fileList = ossFileService.list(new LambdaQueryWrapper().in(OSSFile::getId, fileIds)); + consultationList.setBasisFileName(fileList.stream().map(OSSFile::getFileName).collect(Collectors.joining(","))); + } } return list; }