From c43b9db0b7ce67984e3c3df358cdd79b6d1745b4 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Thu, 15 May 2025 11:18:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-4196)=20-=20=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AF=B9=20wps=20=E6=96=87=E6=A1=A3=E7=9A=84?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=9B=BF=E6=8D=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/common/enums/ApproverSpecifyEnum.java | 2 +- .../request/bpmn/task/BpmnTaskDelegateAssigner.java | 2 +- ...ustomGetProcessInstanceVariablesToObjectCmd.java | 13 ++++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyEnum.java index 2333a9306..8b18cd082 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/ApproverSpecifyEnum.java @@ -17,7 +17,7 @@ public enum ApproverSpecifyEnum { preNodeSpecified("preNodeSpecified", "上级节点指定"), initiatorSpecified("initiatorSpecified", "发起时指定"), // 该枚举，目前主要为了区别签署业务与审批业务的不同配法，选择该项时，意味着该节点是由二方后端自由消费 BpmnSignApproverLimit 配置 - signerRelated("signerRelated", "签署人相关组织") + signerRelated("signerRelated", "签署人相关组织"), ; private String type; private String desc; diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskDelegateAssigner.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskDelegateAssigner.java index fd58d3494..4ffd53853 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskDelegateAssigner.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/request/bpmn/task/BpmnTaskDelegateAssigner.java @@ -106,7 +106,7 @@ public class BpmnTaskDelegateAssigner implements Serializable { private String avatar; /** - * 人员对应的 nodeId， 这里的数据是根据创建流程传入的组织关系自动填充的。业务无需传参 + * 人员对应的 nodeId，如果在审批模板中对应节点未使用流程自主查询审批人的功能(如指定岗位/身份/角色之类),则需要业务方主动传入 */ private String nodeId; diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java index e2f21f5c9..4dadbd133 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomGetProcessInstanceVariablesToObjectCmd.java @@ -175,19 +175,25 @@ public class CustomGetProcessInstanceVariablesToObjectCmd extends AbstractComman variables.add(VariableObjectDTO.builder() .key(field.getId() + "_lower") .desc(field.getName() + "小写") - .value(jsonObject.getString("lower")) + .value(jsonObject.getString("standardNumerals")) .type(convert(field.getType())) .build()); if (Boolean.parseBoolean((String) field.getParam("toUpper"))) { variables.add(VariableObjectDTO.builder() .key(field.getId() + "_upper") .desc(field.getName() + "大写") - .value(jsonObject.getString("upper")) + .value(jsonObject.getString("uppercaseNumerals")) .type(convert(field.getType())) .build()); } } 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 { variables.add(VariableObjectDTO.builder() .key(field.getId()) @@ -276,6 +282,7 @@ public class CustomGetProcessInstanceVariablesToObjectCmd extends AbstractComman case "text": case "textarea": case "amount": + case "contacts": return VariableObjectDTO.Type.text; case "image": return VariableObjectDTO.Type.img;