Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
此号慢热型
o2oa
提交
fa5207b5
o2oa
项目概览
此号慢热型
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fa5207b5
编写于
4月 15, 2020
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
1、流程节点及决策增加版本字段;2、流程导出展现名称改为流程版本名称
上级
a3bb6dce
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
204 addition
and
0 deletion
+204
-0
o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/output/ActionList.java
...ssplatform/assemble/designer/jaxrs/output/ActionList.java
+12
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Agent.java
...java/com/x/processplatform/core/entity/element/Agent.java
+12
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Begin.java
...java/com/x/processplatform/core/entity/element/Begin.java
+13
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Cancel.java
...ava/com/x/processplatform/core/entity/element/Cancel.java
+13
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Choice.java
...ava/com/x/processplatform/core/entity/element/Choice.java
+13
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Delay.java
...java/com/x/processplatform/core/entity/element/Delay.java
+13
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Embed.java
...java/com/x/processplatform/core/entity/element/Embed.java
+12
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/End.java
...n/java/com/x/processplatform/core/entity/element/End.java
+13
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Invoke.java
...ava/com/x/processplatform/core/entity/element/Invoke.java
+13
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Manual.java
...ava/com/x/processplatform/core/entity/element/Manual.java
+13
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Merge.java
...java/com/x/processplatform/core/entity/element/Merge.java
+13
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Message.java
...va/com/x/processplatform/core/entity/element/Message.java
+13
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Parallel.java
...a/com/x/processplatform/core/entity/element/Parallel.java
+13
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Route.java
...java/com/x/processplatform/core/entity/element/Route.java
+13
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Service.java
...va/com/x/processplatform/core/entity/element/Service.java
+13
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Split.java
...java/com/x/processplatform/core/entity/element/Split.java
+12
-0
未找到文件。
o2server/x_processplatform_assemble_designer/src/main/java/com/x/processplatform/assemble/designer/jaxrs/output/ActionList.java
浏览文件 @
fa5207b5
package
com.x.processplatform.assemble.designer.jaxrs.output
;
import
java.util.ArrayList
;
import
java.util.Comparator
;
import
java.util.List
;
import
java.util.stream.Collectors
;
...
...
@@ -25,6 +26,8 @@ import com.x.processplatform.core.entity.element.wrap.WrapForm;
import
com.x.processplatform.core.entity.element.wrap.WrapProcess
;
import
com.x.processplatform.core.entity.element.wrap.WrapProcessPlatform
;
import
com.x.processplatform.core.entity.element.wrap.WrapScript
;
import
org.apache.commons.lang3.BooleanUtils
;
import
org.apache.commons.lang3.StringUtils
;
class
ActionList
extends
BaseAction
{
...
...
@@ -36,6 +39,15 @@ class ActionList extends BaseAction {
List
<
Wo
>
wos
=
emc
.
fetchAll
(
Application
.
class
,
Wo
.
copier
);
List
<
WrapProcess
>
processList
=
emc
.
fetchAll
(
Process
.
class
,
processCopier
);
processList
.
stream
().
forEach
(
o
->
{
if
(
StringUtils
.
isEmpty
(
o
.
getEdition
())){
o
.
setName
(
o
.
getName
()
+
"_V1.0"
);
}
else
{
o
.
setName
(
o
.
getEditionName
());
}
});
processList
=
processList
.
stream
().
sorted
(
Comparator
.
comparing
(
WrapProcess:
:
getName
,
Comparator
.
nullsLast
(
String:
:
compareTo
)))
.
collect
(
Collectors
.
toList
());
List
<
WrapForm
>
formList
=
emc
.
fetchAll
(
Form
.
class
,
formCopier
);
...
...
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Agent.java
浏览文件 @
fa5207b5
...
...
@@ -382,6 +382,11 @@ public class Agent extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
String
displayLogScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
}
...
...
@@ -734,4 +739,11 @@ public class Agent extends Activity {
this
.
opinionGroup
=
opinionGroup
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Begin.java
浏览文件 @
fa5207b5
...
...
@@ -345,6 +345,11 @@ public class Begin extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
String
displayLogScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
}
...
...
@@ -673,4 +678,12 @@ public class Begin extends Activity {
this
.
opinionGroup
=
opinionGroup
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
\ No newline at end of file
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Cancel.java
浏览文件 @
fa5207b5
...
...
@@ -344,6 +344,11 @@ public class Cancel extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
String
displayLogScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
}
...
...
@@ -656,4 +661,12 @@ public class Cancel extends Activity {
this
.
opinionGroup
=
opinionGroup
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
\ No newline at end of file
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Choice.java
浏览文件 @
fa5207b5
...
...
@@ -359,6 +359,11 @@ public class Choice extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
String
displayLogScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
}
...
...
@@ -679,4 +684,12 @@ public class Choice extends Activity {
this
.
opinionGroup
=
opinionGroup
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
\ No newline at end of file
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Delay.java
浏览文件 @
fa5207b5
...
...
@@ -407,6 +407,11 @@ public class Delay extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
String
displayLogScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
}
...
...
@@ -783,4 +788,12 @@ public class Delay extends Activity {
this
.
delayMode
=
delayMode
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Embed.java
浏览文件 @
fa5207b5
...
...
@@ -484,6 +484,11 @@ public class Embed extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
String
displayLogScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
}
...
...
@@ -940,4 +945,11 @@ public class Embed extends Activity {
this
.
opinionGroup
=
opinionGroup
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
\ No newline at end of file
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/End.java
浏览文件 @
fa5207b5
...
...
@@ -352,6 +352,11 @@ public class End extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
String
displayLogScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
}
...
...
@@ -672,4 +677,12 @@ public class End extends Activity {
this
.
opinionGroup
=
opinionGroup
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Invoke.java
浏览文件 @
fa5207b5
...
...
@@ -506,6 +506,11 @@ public class Invoke extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
String
displayLogScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
}
...
...
@@ -1002,4 +1007,12 @@ public class Invoke extends Activity {
this
.
jaxrsHeadScriptText
=
jaxrsHeadScriptText
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
\ No newline at end of file
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Manual.java
浏览文件 @
fa5207b5
...
...
@@ -582,6 +582,11 @@ public class Manual extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
String
displayLogScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
}
...
...
@@ -1178,4 +1183,12 @@ public class Manual extends Activity {
this
.
opinionGroup
=
opinionGroup
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Merge.java
浏览文件 @
fa5207b5
...
...
@@ -351,6 +351,11 @@ public class Merge extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
String
displayLogScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
}
...
...
@@ -671,4 +676,12 @@ public class Merge extends Activity {
this
.
opinionGroup
=
opinionGroup
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Message.java
浏览文件 @
fa5207b5
...
...
@@ -360,6 +360,11 @@ public class Message extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
String
displayLogScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
}
...
...
@@ -688,4 +693,12 @@ public class Message extends Activity {
this
.
opinionGroup
=
opinionGroup
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Parallel.java
浏览文件 @
fa5207b5
...
...
@@ -360,6 +360,11 @@ public class Parallel extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
String
displayLogScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
}
...
...
@@ -680,4 +685,12 @@ public class Parallel extends Activity {
this
.
opinionGroup
=
opinionGroup
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Route.java
浏览文件 @
fa5207b5
...
...
@@ -265,6 +265,11 @@ public class Route extends SliceJpaObject {
@CheckPersist
(
allowEmpty
=
true
)
private
String
appendTaskIdentityScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getAppendTaskIdentityType
()
{
return
appendTaskIdentityType
;
}
...
...
@@ -493,4 +498,12 @@ public class Route extends SliceJpaObject {
this
.
validationScriptText
=
validationScriptText
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Service.java
浏览文件 @
fa5207b5
...
...
@@ -378,6 +378,11 @@ public class Service extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
String
displayLogScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
}
...
...
@@ -722,4 +727,12 @@ public class Service extends Activity {
this
.
opinionGroup
=
opinionGroup
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
\ No newline at end of file
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Split.java
浏览文件 @
fa5207b5
...
...
@@ -366,6 +366,11 @@ public class Split extends Activity {
@CheckPersist
(
allowEmpty
=
true
)
private
String
displayLogScriptText
;
public
static
final
String
edition_FIELDNAME
=
"edition"
;
@FieldDescribe
(
"版本编码."
)
@Column
(
length
=
JpaObject
.
length_255B
,
name
=
ColumnNamePrefix
+
edition_FIELDNAME
)
private
String
edition
;
public
String
getDisplayLogScript
()
{
return
displayLogScript
;
}
...
...
@@ -702,4 +707,11 @@ public class Split extends Activity {
this
.
opinionGroup
=
opinionGroup
;
}
public
String
getEdition
()
{
return
edition
;
}
public
void
setEdition
(
String
edition
)
{
this
.
edition
=
edition
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录