Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
96bdd4df
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
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,发现更多精彩内容 >>
提交
96bdd4df
编写于
11月 09, 2020
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加优先路由立即执行配置项
上级
94c0a319
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
31 addition
and
2 deletion
+31
-2
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/RouteProperties.java
.../processplatform/core/entity/element/RouteProperties.java
+15
-0
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java
.../service/processing/processor/manual/ManualProcessor.java
+3
-2
未找到文件。
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Route.java
浏览文件 @
96bdd4df
...
@@ -72,6 +72,7 @@ public class Route extends SliceJpaObject {
...
@@ -72,6 +72,7 @@ public class Route extends SliceJpaObject {
@PostLoad
@PostLoad
public
void
postLoad
()
{
public
void
postLoad
()
{
this
.
asyncSupported
=
this
.
getProperties
().
getAsyncSupported
();
this
.
asyncSupported
=
this
.
getProperties
().
getAsyncSupported
();
this
.
soleDirect
=
this
.
getProperties
().
getSoleDirect
();
}
}
public
Route
()
{
public
Route
()
{
...
@@ -93,14 +94,26 @@ public class Route extends SliceJpaObject {
...
@@ -93,14 +94,26 @@ public class Route extends SliceJpaObject {
return
asyncSupported
;
return
asyncSupported
;
}
}
public
Boolean
getSoleDirect
()
{
return
soleDirect
;
}
public
void
setAsyncSupported
(
Boolean
asyncSupported
)
{
public
void
setAsyncSupported
(
Boolean
asyncSupported
)
{
this
.
asyncSupported
=
asyncSupported
;
this
.
asyncSupported
=
asyncSupported
;
this
.
getProperties
().
setAsyncSupported
(
asyncSupported
);
this
.
getProperties
().
setAsyncSupported
(
asyncSupported
);
}
}
public
void
setSoleDirect
(
Boolean
soleDirect
)
{
this
.
soleDirect
=
soleDirect
;
this
.
getProperties
().
setSoleDirect
(
soleDirect
);
}
@Transient
@Transient
private
Boolean
asyncSupported
;
private
Boolean
asyncSupported
;
@Transient
private
Boolean
soleDirect
;
public
static
final
String
name_FIELDNAME
=
"name"
;
public
static
final
String
name_FIELDNAME
=
"name"
;
@FieldDescribe
(
"名称."
)
@FieldDescribe
(
"名称."
)
@Column
(
length
=
length_255B
,
name
=
ColumnNamePrefix
+
name_FIELDNAME
)
@Column
(
length
=
length_255B
,
name
=
ColumnNamePrefix
+
name_FIELDNAME
)
...
...
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/RouteProperties.java
浏览文件 @
96bdd4df
package
com.x.processplatform.core.entity.element
;
package
com.x.processplatform.core.entity.element
;
import
org.apache.commons.lang3.BooleanUtils
;
import
com.x.base.core.entity.JsonProperties
;
import
com.x.base.core.entity.JsonProperties
;
import
com.x.base.core.project.annotation.FieldDescribe
;
import
com.x.base.core.project.annotation.FieldDescribe
;
public
class
RouteProperties
extends
JsonProperties
{
public
class
RouteProperties
extends
JsonProperties
{
private
static
final
long
serialVersionUID
=
-
7792270726211126577L
;
@FieldDescribe
(
"是否启用异步返回."
)
@FieldDescribe
(
"是否启用异步返回."
)
private
Boolean
asyncSupported
=
true
;
private
Boolean
asyncSupported
=
true
;
@FieldDescribe
(
"选择优先路由时是否直接执行路由(一票否决),默认true."
)
private
Boolean
soleDirect
;
public
Boolean
getAsyncSupported
()
{
public
Boolean
getAsyncSupported
()
{
return
asyncSupported
;
return
asyncSupported
;
}
}
...
@@ -16,4 +23,12 @@ public class RouteProperties extends JsonProperties {
...
@@ -16,4 +23,12 @@ public class RouteProperties extends JsonProperties {
this
.
asyncSupported
=
asyncSupported
;
this
.
asyncSupported
=
asyncSupported
;
}
}
public
Boolean
getSoleDirect
()
{
return
BooleanUtils
.
isNotFalse
(
soleDirect
);
}
public
void
setSoleDirect
(
Boolean
soleDirect
)
{
this
.
soleDirect
=
soleDirect
;
}
}
}
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/processor/manual/ManualProcessor.java
浏览文件 @
96bdd4df
...
@@ -453,8 +453,9 @@ public class ManualProcessor extends AbstractManualProcessor {
...
@@ -453,8 +453,9 @@ public class ManualProcessor extends AbstractManualProcessor {
boolean
passThrough
=
false
;
boolean
passThrough
=
false
;
// 取得本环节已经处理的已办
// 取得本环节已经处理的已办
List
<
TaskCompleted
>
taskCompleteds
=
this
.
listJoinInquireTaskCompleted
(
aeiObjects
,
identities
);
List
<
TaskCompleted
>
taskCompleteds
=
this
.
listJoinInquireTaskCompleted
(
aeiObjects
,
identities
);
// 存在优先路由,如果有人选择了优先路由那么直接流转.
// 存在优先路由,如果有人选择了优先路由那么直接流转.需要判断是否启用了soleDirect
Route
soleRoute
=
aeiObjects
.
getRoutes
().
stream
().
filter
(
r
->
BooleanUtils
.
isTrue
(
r
.
getSole
())).
findFirst
()
Route
soleRoute
=
aeiObjects
.
getRoutes
().
stream
()
.
filter
(
r
->
BooleanUtils
.
isTrue
(
r
.
getSole
())
&&
BooleanUtils
.
isTrue
(
r
.
getSoleDirect
())).
findFirst
()
.
orElse
(
null
);
.
orElse
(
null
);
if
(
null
!=
soleRoute
)
{
if
(
null
!=
soleRoute
)
{
TaskCompleted
soleTaskCompleted
=
taskCompleteds
.
stream
()
TaskCompleted
soleTaskCompleted
=
taskCompleteds
.
stream
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录