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

feat(REQ-3769) - 调整审批过程中，节点生成文档的逻辑

Browse Source
This commit is contained in:
wangli 2025-04-08 10:14:09 +08:00
parent b8b89332b6
commit 3d24d3ff0a
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/ExtAxModelDocService.java
View File

@ -46,7 +46,7 @@ public interface ExtAxModelDocService {
* @param dto
* @return
*/
Boolean createDoc(DocCreateDTO dto, Boolean fireEvent);
Long createDoc(DocCreateDTO dto, Boolean fireEvent);
/**
* 模型文档更新
@ -62,7 +62,7 @@ public interface ExtAxModelDocService {
* @param docId
* @return
*/
Boolean cloneDoc(Long docId);
Long cloneDoc(Long docId);
/**
* 模型文档删除

10
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/impl/ExtAxModelDocServiceImpl.java
View File

@ -116,7 +116,7 @@ public class ExtAxModelDocServiceImpl implements ExtAxModelDocService {
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean createDoc(DocCreateDTO dto, Boolean fireEvent) {
public Long createDoc(DocCreateDTO dto, Boolean fireEvent) {
// 用于发送文档变更事件
List<ExtAxModelDoc> oldSettings = querySetting(dto.getModelKey(), dto.getTenantId());
@ -141,7 +141,7 @@ public class ExtAxModelDocServiceImpl implements ExtAxModelDocService {
// 发送文档变更事件
eventPublisher.publishEvent(new DocChangeEventImpl(dto.getModelKey(), dto.getTenantId(), oldSettings, querySetting(dto.getModelKey(), dto.getTenantId())));
return flat > 0;
return entity.getId();
}
@Override
@ -183,7 +183,7 @@ public class ExtAxModelDocServiceImpl implements ExtAxModelDocService {
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean cloneDoc(Long docId) {
public Long cloneDoc(Long docId) {
ExtAxModelDoc origin = extAxModelDocMapper.selectById(docId);
if (Objects.isNull(origin)) {
throw new WorkflowEngineException(MODEL_FILE_NOT_EXISTS);
@ -196,11 +196,11 @@ public class ExtAxModelDocServiceImpl implements ExtAxModelDocService {
// 强制清空业务标签
newDoc.setTag("");
newDoc.setContent(extAxDocContentService.getContent(Long.valueOf(origin.getFileRelationId())));
createDoc(newDoc, false);
Long newDocId = createDoc(newDoc, false);
// 发送文档变更事件
eventPublisher.publishEvent(new DocChangeEventImpl(origin.getModelKey(), origin.getTenantId(), oldSettings, querySetting(origin.getModelKey(), origin.getTenantId())));
return true;
return newDocId;
} else {
throw new WorkflowEngineException(MODEL_FILE_TYPE_CLONE_NOT_SUPPORT);
}

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

@ -14,6 +14,7 @@ import cn.axzo.workflow.core.listener.AbstractBpmnEventListener;
import cn.axzo.workflow.core.listener.BpmnProcessEventListener;
import cn.axzo.workflow.core.repository.entity.ExtAxProcessSign;
import cn.axzo.workflow.core.repository.mapper.ExtAxModelDocMapper;
import cn.axzo.workflow.core.service.ExtAxModelDocService;
import cn.axzo.workflow.core.service.ExtAxProcessSignService;
import cn.azxo.framework.common.model.CommonResponse;
import lombok.extern.slf4j.Slf4j;
@ -27,6 +28,7 @@ import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
import org.flowable.engine.impl.util.CommandContextUtil;
import org.flowable.engine.impl.util.ProcessDefinitionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.context.annotation.Scope;
import org.springframework.core.Ordered;
@ -65,6 +67,8 @@ public class FileArchiveProcessEventListener extends AbstractBpmnEventListener<P
private ExtAxProcessSignService extAxProcessSignService;
@Resource
private DocAnonymousDatabaseApi docApi;
@Autowired
private ExtAxModelDocService extAxModelDocService;
/**
* 创建流程成功，判断是否是签署业务，如果是签署业务，则进行第一次模型文件的副本创建，作为与当前流程对应版本使用
@ -104,6 +108,8 @@ public class FileArchiveProcessEventListener extends AbstractBpmnEventListener<P
signFileDTO.setFileCode(response.getData());
break;
case HIPRINT:
Long newDocId = extAxModelDocService.cloneDoc(doc.getId());
signFileDTO.setFileCode(String.valueOf(newDocId));
break;
case PDF:
break;

8
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessModelController.java
View File

@ -459,7 +459,7 @@ public class BpmnProcessModelController implements ProcessModelApi {
@Operation(summary = "添加关联文档")
@PutMapping(value = "/doc/create")
public CommonResponse<Boolean> createDoc(@Validated @RequestBody DocCreateDTO dto) {
return success(modelDocService.createDoc(dto, true));
return success(modelDocService.createDoc(dto, true) > 0);
}
@Override
@ -503,7 +503,7 @@ public class BpmnProcessModelController implements ProcessModelApi {
newDoc.setTenantId(docModelInfo.getTenantId());
newDoc.setTag(docModelInfo.getTag());
}
return modelDocService.createDoc(newDoc, false);
return modelDocService.createDoc(newDoc, false) > 0;
}
if (Objects.equals(originDoc.getFileType(), FileTypeEnum.PDF)) {
// PDF 文档 clone
@ -524,9 +524,9 @@ public class BpmnProcessModelController implements ProcessModelApi {
newDoc.setTenantId(docModelInfo.getTenantId());
newDoc.setTag(docModelInfo.getTag());
}
return modelDocService.createDoc(newDoc, false);
return modelDocService.createDoc(newDoc, false) > 0;
}
return modelDocService.cloneDoc(docId);
return modelDocService.cloneDoc(docId) > 0;
}
@Override