wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-5965' into pre

Browse Source
This commit is contained in:
wangli 2025-12-25 13:56:02 +08:00
commit 9bb533147d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/process/FileArchiveProcessEventListener.java
View File

@ -16,6 +16,7 @@ import cn.axzo.workflow.core.service.ExtAxDocContentService;
import cn.axzo.workflow.core.service.ExtAxModelDocService; import cn.axzo.workflow.core.service.ExtAxModelDocService;
import cn.axzo.workflow.core.service.ExtAxProcessSignService; import cn.axzo.workflow.core.service.ExtAxProcessSignService;
import cn.axzo.workflow.server.common.util.WpsUtil; import cn.axzo.workflow.server.common.util.WpsUtil;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.model.Process; import org.flowable.bpmn.model.Process;
import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent; import org.flowable.common.engine.api.delegate.event.FlowableEngineEntityEvent;
@ -78,6 +79,7 @@ public class FileArchiveProcessEventListener extends AbstractBpmnEventListener<P
.processInstanceId(processInstanceId).includeProcessVariables().singleResult(); .processInstanceId(processInstanceId).includeProcessVariables().singleResult();
CategoryItemVO category = categoryService.get(BPM_MODEL_CATEGORY, mainProcess.getId()).orElse(new CategoryItemVO()); CategoryItemVO category = categoryService.get(BPM_MODEL_CATEGORY, mainProcess.getId()).orElse(new CategoryItemVO());
log.info("get category autoReplaceVariables： {}", JSON.toJSONString(category));
// 文件归档，将审批过程中产生的数据全部替换文档模板变量 // 文件归档，将审批过程中产生的数据全部替换文档模板变量
archiveFinalDocs(instance, category.getAutoReplaceVariables()); archiveFinalDocs(instance, category.getAutoReplaceVariables());
} }
@ -87,6 +89,7 @@ public class FileArchiveProcessEventListener extends AbstractBpmnEventListener<P
ExtAxProcessSign processSign = extAxProcessSignService.findByProcessInstanceId(instance.getId()); ExtAxProcessSign processSign = extAxProcessSignService.findByProcessInstanceId(instance.getId());
List<VariableObjectDTO> wpsReplaceVariables = wpsUtil.getWpsReplaceVariables(processEngineConfiguration, instance.getId()); List<VariableObjectDTO> wpsReplaceVariables = wpsUtil.getWpsReplaceVariables(processEngineConfiguration, instance.getId());
log.info("archiveFinalDocs wpsReplaceVariables: {}", JSON.toJSONString(wpsReplaceVariables));
processSign.getFileArchive().stream().filter(i -> Objects.equals(i.getFileType(), FileTypeEnum.WORD) processSign.getFileArchive().stream().filter(i -> Objects.equals(i.getFileType(), FileTypeEnum.WORD)
|| Objects.equals(i.getFileType(), FileTypeEnum.EXCEL)) || Objects.equals(i.getFileType(), FileTypeEnum.EXCEL))
.filter(i -> Boolean.TRUE.equals(i.getNeedReplaceVariables())) .filter(i -> Boolean.TRUE.equals(i.getNeedReplaceVariables()))