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

update - 更新待办模板取消配置模板 ID

Browse Source
This commit is contained in:
wangli 2023-12-12 20:10:39 +08:00
parent 17a11b6aec
commit 155e76af47
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java
View File

@ -317,38 +317,41 @@ public final class BpmnJsonConverterUtil {
noticeConfigElement.setName(CONFIG_NOTICE); noticeConfigElement.setName(CONFIG_NOTICE);
// 通知消息模板配置 // 通知消息模板配置
if (Objects.nonNull(noticeConf.getNotice()) || Objects.nonNull(noticeConf.getNotice().getNoticeMessageId())) { if (Objects.nonNull(noticeConf.getNotice()) && Objects.nonNull(noticeConf.getNotice().getNoticeMessageId())) {
ExtensionElement noticeMessage = new ExtensionElement(); ExtensionElement noticeMessage = new ExtensionElement();
noticeMessage.setName(TEMPLATE_NOTICE_MESSAGE_ID); noticeMessage.setName(TEMPLATE_NOTICE_MESSAGE_ID);
ExtensionAttribute noticeMessageAttribute = new ExtensionAttribute(); ExtensionAttribute noticeMessageAttribute = new ExtensionAttribute();
noticeMessageAttribute.setName(ELEMENT_ATTRIBUTE_VALUE); noticeMessageAttribute.setName(ELEMENT_ATTRIBUTE_VALUE);
noticeMessageAttribute.setValue(noticeConf.getNotice().getNoticeMessageId()); noticeMessageAttribute.setValue(noticeConf.getNotice().getNoticeMessageId());
noticeMessage.addAttribute(noticeMessageAttribute); noticeMessage.addAttribute(noticeMessageAttribute);
noticeMessage.setElementText(noticeConf.getNotice().getViewJson()); noticeMessage.setElementText(StringUtils.hasLength(noticeConf.getNotice().getViewJson()) ?
noticeConf.getNotice().getViewJson() : "");
noticeConfigElement.addChildElement(noticeMessage); noticeConfigElement.addChildElement(noticeMessage);
} }
// 代办消息模板配置 // 代办消息模板配置
if (Objects.nonNull(noticeConf.getPending()) || Objects.nonNull(noticeConf.getPending().getPendingMessageId())) { if (Objects.nonNull(noticeConf.getPending()) && Objects.nonNull(noticeConf.getPending().getPendingMessageId())) {
ExtensionElement pendingMessage = new ExtensionElement(); ExtensionElement pendingMessage = new ExtensionElement();
pendingMessage.setName(TEMPLATE_PENDING_MESSAGE_ID); pendingMessage.setName(TEMPLATE_PENDING_MESSAGE_ID);
ExtensionAttribute pendingMessageAttribute = new ExtensionAttribute(); ExtensionAttribute pendingMessageAttribute = new ExtensionAttribute();
pendingMessageAttribute.setName(ELEMENT_ATTRIBUTE_VALUE); pendingMessageAttribute.setName(ELEMENT_ATTRIBUTE_VALUE);
pendingMessageAttribute.setValue(noticeConf.getPending().getPendingMessageId()); pendingMessageAttribute.setValue(noticeConf.getPending().getPendingMessageId());
pendingMessage.addAttribute(pendingMessageAttribute); pendingMessage.addAttribute(pendingMessageAttribute);
pendingMessage.setElementText(noticeConf.getPending().getViewJson()); pendingMessage.setElementText(StringUtils.hasLength(noticeConf.getPending().getViewJson()) ?
noticeConf.getPending().getViewJson() : "");
noticeConfigElement.addChildElement(pendingMessage); noticeConfigElement.addChildElement(pendingMessage);
} }
// 短信模板配置 // 短信模板配置
if (Objects.nonNull(noticeConf.getSms()) || Objects.nonNull(noticeConf.getSms().getSmsId())) { if (Objects.nonNull(noticeConf.getSms()) && Objects.nonNull(noticeConf.getSms().getSmsId())) {
ExtensionElement smsMessage = new ExtensionElement(); ExtensionElement smsMessage = new ExtensionElement();
smsMessage.setName(TEMPLATE_SMS_MESSAGE_ID); smsMessage.setName(TEMPLATE_SMS_MESSAGE_ID);
ExtensionAttribute smsMessageAttribute = new ExtensionAttribute(); ExtensionAttribute smsMessageAttribute = new ExtensionAttribute();
smsMessageAttribute.setName(ELEMENT_ATTRIBUTE_VALUE); smsMessageAttribute.setName(ELEMENT_ATTRIBUTE_VALUE);
smsMessageAttribute.setValue(noticeConf.getSms().getSmsId()); smsMessageAttribute.setValue(noticeConf.getSms().getSmsId());
smsMessage.addAttribute(smsMessageAttribute); smsMessage.addAttribute(smsMessageAttribute);
smsMessage.setElementText(noticeConf.getSms().getViewJson()); smsMessage.setElementText(StringUtils.hasLength(noticeConf.getSms().getViewJson()) ?
noticeConf.getSms().getViewJson() : "");
noticeConfigElement.addChildElement(smsMessage); noticeConfigElement.addChildElement(smsMessage);
} }
mainProcess.addExtensionElement(noticeConfigElement); mainProcess.addExtensionElement(noticeConfigElement);