From 65763d38cf9b6b8067a293d9c99297efea0de3e3 Mon Sep 17 00:00:00 2001
From: 928255095 <928255095@qq.com>
Date: 星期二, 07 九月 2021 22:04:15 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' into 'master'
---
java110-bean/src/main/java/com/java110/dto/workflow/WorkflowDto.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/dto/workflow/WorkflowDto.java b/java110-bean/src/main/java/com/java110/dto/workflow/WorkflowDto.java
old mode 100644
new mode 100755
index 04c40b7..f398d43
--- a/java110-bean/src/main/java/com/java110/dto/workflow/WorkflowDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/workflow/WorkflowDto.java
@@ -22,7 +22,28 @@
public static final String FLOW_TYPE_REPAIR= "20002";
//閲囪喘
public static final String FLOW_TYPE_PURCHASE= "30003";
+ //鐗╁搧棰嗙敤
+ public static final String FLOW_TYPE_COLLECTION = "40004";//鐗╁搧棰嗙敤
+
+ //鍚堝悓鐢宠缁瀹℃牳
+ public static final String FLOW_TYPE_CONTRACT_APPLY = "50005";//鍚堝悓鐢宠
+
+ //鍚堝悓鍙樻洿瀹℃牳
+ public static final String FLOW_TYPE_CONTRACT_CHANGE = "60006";//鍚堝悓鍙樻洿瀹℃牳
+
+
+ //鐗╁搧璋冩嫧
+ public static final String FLOW_TYPE_ALLOCATION_STOREHOUSE = "70007";//鐗╁搧璋冩嫧
+
+
+ //鐗╁搧琚皟鎷�
+ public static final String FLOW_TYPE_ALLOCATION_STOREHOUSE_GO = "80008";//鐗╁搧琚皟鎷�
+
+
+
public static final String DEFAULT_SKIP_LEVEL = "1";
+
+ public static final String DEFAULT_PROCESS = "java110_" ;
private String skipLevel;
private String describle;
@@ -32,6 +53,10 @@
private String flowName;
private String flowType;
private String flowTypeName;
+ private String processDefinitionKey;
+ private String operationType;
+
+ private String[] flowTypes;
private Date createTime;
@@ -130,4 +155,28 @@
public void setWorkflowSteps(List<WorkflowStepDto> workflowSteps) {
this.workflowSteps = workflowSteps;
}
+
+ public String getProcessDefinitionKey() {
+ return processDefinitionKey;
+ }
+
+ public void setProcessDefinitionKey(String processDefinitionKey) {
+ this.processDefinitionKey = processDefinitionKey;
+ }
+
+ public String[] getFlowTypes() {
+ return flowTypes;
+ }
+
+ public void setFlowTypes(String[] flowTypes) {
+ this.flowTypes = flowTypes;
+ }
+
+ public String getOperationType() {
+ return operationType;
+ }
+
+ public void setOperationType(String operationType) {
+ this.operationType = operationType;
+ }
}
--
Gitblit v1.8.0