From bf75f7ea566ddac257ae520bcfb51481bd3a8920 Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Thu, 25 Jan 2024 19:10:25 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E5=A4=84=E7=90=86-eoa=E8=8A=82=E7=82=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=9A=84=E9=99=84=E4=BB=B6=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=9B=9E?= =?UTF-8?q?=E6=98=BE=E5=9C=A8=E9=99=84=E4=BB=B6=E6=B8=85=E5=8D=95=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1076049247436800]工单处理-eoa节点上传的附件，没有回显在附件清单中 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1076049247436800 --- .../api/processtask/SearchProcessTaskFileApi.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskFileApi.java b/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskFileApi.java index 09653f866..a20ea7e6a 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskFileApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/SearchProcessTaskFileApi.java @@ -25,13 +25,17 @@ import neatlogic.framework.form.constvalue.FormHandler; import neatlogic.framework.process.auth.PROCESS_BASE; import neatlogic.framework.process.dao.mapper.ProcessTaskMapper; import neatlogic.framework.process.dto.ProcessTaskFormAttributeDataVo; +import neatlogic.framework.process.dto.ProcessTaskStepVo; import neatlogic.framework.process.exception.processtask.ProcessTaskNotFoundException; +import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; +import neatlogic.framework.process.stephandler.core.ProcessStepInternalHandlerFactory; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -123,6 +127,17 @@ public class SearchProcessTaskFileApi extends PrivateApiComponentBase { if (taskFileList.size() > 0) { fileList.addAll(taskFileList); } + List stepFileIdList = new ArrayList<>(); + List processTaskStepList = processTaskMapper.getProcessTaskStepListByProcessTaskId(processTaskId); + for (ProcessTaskStepVo processTaskStepVo : processTaskStepList) { + IProcessStepInternalHandler handler = ProcessStepInternalHandlerFactory.getHandler(processTaskStepVo.getHandler()); + if (handler != null) { + stepFileIdList.addAll(handler.getFileIdList(processTaskStepVo)); + } + } + if (CollectionUtils.isNotEmpty(stepFileIdList)) { + fileList.addAll(fileMapper.getFileDetailListByIdList(stepFileIdList)); + } if (fileList.size() > 0) { fileList = fileList.stream().sorted(Comparator.comparing(FileVo::getUploadTime, Comparator.nullsLast(Date::compareTo).reversed())).collect(Collectors.toList()); if (basePageVo.getNeedPage()) { -- Gitee