From 469b13586164417cf0f4cc0aa54539af7a65a553 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 26 Apr 2024 16:56:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=96=B0=E5=A2=9E=E6=96=87=E4=BB=B6=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E6=88=90docx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/ProcessESChangeEndListener.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java index 6d8dc898..a6683930 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/listener/ProcessESChangeEndListener.java @@ -97,6 +97,11 @@ public class ProcessESChangeEndListener implements ExecutionListener { @Resource private IBusProcessModelHisService busProcessModelHisService; + + @Resource + private ILawsCommonService lawsCommonService; + + private static final String MODULE_VALUE = TableNameEnum.ENTERPRISE_STANDARDS.getValue(); @Override public void notify(DelegateExecution delegateExecution) { @@ -111,12 +116,23 @@ public class ProcessESChangeEndListener implements ExecutionListener { // 根据标准编号找到标准Id LawsEnterpriseStandard es = esService.getOne(new LambdaQueryWrapper() .eq(LawsEnterpriseStandard::getStandardNumber, standNo)); + Map esDataMap = lawsCommonService.getByIdAndModule(es.getId(), MODULE_VALUE, "2", null); // 转换成Map 然后走commonEdit接口 Map parameterMap = new HashMap<>(); this.buildMap(parameterMap, change); - // 替换相应文件的url - if (StrUtil.isNotBlank(change.getReplaceFileId()) && StrUtil.isNotBlank(change.getOnEditFile())) { - busProcessModelHisService.replaceFile(change.getOnEditFile(), change.getReplaceFileId()); + String onEditFileId = change.getOnEditFile(); + String replaceFileId = change.getReplaceFileId(); + if (StrUtil.isNotBlank(onEditFileId)) { + if (StrUtil.isNotBlank(replaceFileId)) { + busProcessModelHisService.replaceFile(onEditFileId, replaceFileId); + } else { + String fileId = busProcessModelHisService.saveProcessFileToOss(onEditFileId); + String existFileIds = (String) esDataMap.get(FieldCommon.FILE_PUBLISH_OF_ORIGINAL); + if (StrUtil.isNotBlank(existFileIds)) { + fileId += "," + existFileIds; + } + parameterMap.put(FieldCommon.FILE_PUBLISH_OF_ORIGINAL, fileId); + } } // 保存修改的文件 commonService.commonEdit(parameterMap);