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

feat(REQ-4196) - 处理流程对 wps 文档的变量替换逻辑

Browse Source
This commit is contained in:
wangli 2025-05-15 11:18:28 +08:00
parent a9f8057db6
commit c43b9db0b7
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyEnum.java
View File

@ -17,7 +17,7 @@ public enum ApproverSpecifyEnum {
preNodeSpecified("preNodeSpecified", "上级节点指定"), preNodeSpecified("preNodeSpecified", "上级节点指定"),
initiatorSpecified("initiatorSpecified", "发起时指定"), initiatorSpecified("initiatorSpecified", "发起时指定"),
// 该枚举，目前主要为了区别签署业务与审批业务的不同配法，选择该项时，意味着该节点是由二方后端自由消费 BpmnSignApproverLimit 配置 // 该枚举，目前主要为了区别签署业务与审批业务的不同配法，选择该项时，意味着该节点是由二方后端自由消费 BpmnSignApproverLimit 配置
signerRelated("signerRelated", "签署人相关组织") signerRelated("signerRelated", "签署人相关组织"),
; ;
private String type; private String type;
private String desc; private String desc;

2
workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskDelegateAssigner.java
View File

@ -106,7 +106,7 @@ public class BpmnTaskDelegateAssigner implements Serializable {
private String avatar; private String avatar;
/** /**
* 人员对应的 nodeId， 这里的数据是根据创建流程传入的组织关系自动填充的。业务无需传参 * 人员对应的 nodeId，如果在审批模板中对应节点未使用流程自主查询审批人的功能(如指定岗位/身份/角色之类),则需要业务方主动传入
*/ */
private String nodeId; private String nodeId;

13
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java
View File

@ -175,19 +175,25 @@ public class CustomGetProcessInstanceVariablesToObjectCmd extends AbstractComman
variables.add(VariableObjectDTO.builder() variables.add(VariableObjectDTO.builder()
.key(field.getId() + "_lower") .key(field.getId() + "_lower")
.desc(field.getName() + "小写") .desc(field.getName() + "小写")
.value(jsonObject.getString("lower")) .value(jsonObject.getString("standardNumerals"))
.type(convert(field.getType())) .type(convert(field.getType()))
.build()); .build());
if (Boolean.parseBoolean((String) field.getParam("toUpper"))) { if (Boolean.parseBoolean((String) field.getParam("toUpper"))) {
variables.add(VariableObjectDTO.builder() variables.add(VariableObjectDTO.builder()
.key(field.getId() + "_upper") .key(field.getId() + "_upper")
.desc(field.getName() + "大写") .desc(field.getName() + "大写")
.value(jsonObject.getString("upper")) .value(jsonObject.getString("uppercaseNumerals"))
.type(convert(field.getType())) .type(convert(field.getType()))
.build()); .build());
} }
} else if (Objects.equals(field.getType(), "contacts")) { } else if (Objects.equals(field.getType(), "contacts")) {
// TODO // TODO 需要根据组件提交数据独立解析
variables.add(VariableObjectDTO.builder()
.key(field.getId())
.desc(field.getName())
.value("")
.type(convert(field.getType()))
.build());
} else { } else {
variables.add(VariableObjectDTO.builder() variables.add(VariableObjectDTO.builder()
.key(field.getId()) .key(field.getId())
@ -276,6 +282,7 @@ public class CustomGetProcessInstanceVariablesToObjectCmd extends AbstractComman
case "text": case "text":
case "textarea": case "textarea":
case "amount": case "amount":
case "contacts":
return VariableObjectDTO.Type.text; return VariableObjectDTO.Type.text;
case "image": case "image":
return VariableObjectDTO.Type.img; return VariableObjectDTO.Type.img;