Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
此号慢热型
o2oa
提交
f13efc31
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,发现更多精彩内容 >>
提交
f13efc31
编写于
1月 11, 2021
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
增加allowResume
上级
cd3c9f8d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
40 addition
and
19 deletion
+40
-19
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/control/ActionGetWorkOrWorkCompleted.java
...e/surface/jaxrs/control/ActionGetWorkOrWorkCompleted.java
+22
-11
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/control/BaseAction.java
...ssplatform/assemble/surface/jaxrs/control/BaseAction.java
+18
-8
未找到文件。
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/control/ActionGetWorkOrWorkCompleted.java
浏览文件 @
f13efc31
...
...
@@ -111,15 +111,24 @@ class ActionGetWorkOrWorkCompleted extends BaseAction {
wo
.
setAllowReset
(
PropertyTools
.
getOrElse
(
activity
,
Manual
.
allowReset_FIELDNAME
,
Boolean
.
class
,
false
)
&&
wo
.
getAllowSave
());
// 是否可以调度
wo
.
setAllowReroute
(
PropertyTools
.
getOrElse
(
activity
,
Manual
.
allowReroute_FIELDNAME
,
Boolean
.
class
,
false
)
wo
.
setAllowReroute
(
PropertyTools
.
getOrElse
(
activity
,
Activity
.
allowReroute_FIELDNAME
,
Boolean
.
class
,
false
)
&&
this
.
canManageApplicationOrProcess
(
business
,
effectivePerson
,
work
.
getApplication
(),
work
.
getProcess
()));
// 是否可以删除
wo
.
setAllowDelete
(
PropertyTools
.
getOrElse
(
activity
,
Manual
.
allowDeleteWork_FIELDNAME
,
Boolean
.
class
,
false
)
&&
wo
.
getAllowSave
());
// 是否可以挂起待办,暂停待办计时
wo
.
setAllowPause
(
PropertyTools
.
getOrElse
(
activity
,
Manual
.
allowPause_FIELDNAME
,
Boolean
.
class
,
false
)
&&
wo
.
getAllowPause
());
if
(
PropertyTools
.
getOrElse
(
activity
,
Manual
.
allowPause_FIELDNAME
,
Boolean
.
class
,
false
)
&&
wo
.
getAllowPause
())
{
// 如果已经处于挂起状态,那么允许恢复
if
(
this
.
hasPauseTaskWithWork
(
business
,
effectivePerson
,
work
.
getId
()))
{
wo
.
setAllowResume
(
true
);
}
else
{
wo
.
setAllowPause
(
true
);
}
}
// 是否可以增加会签分支
if
(
BooleanUtils
.
isTrue
(
PropertyTools
.
getOrElse
(
activity
,
Manual
.
allowAddSplit_FIELDNAME
,
Boolean
.
class
,
false
))
&&
BooleanUtils
.
isTrue
(
work
.
getSplitting
()))
{
...
...
@@ -179,14 +188,6 @@ class ActionGetWorkOrWorkCompleted extends BaseAction {
}
return
false
;
});
// Boolean o = this.hasTaskCompletedWithActivityToken.get(activityToken);
// if (null == o) {
// o = business.entityManagerContainer().countEqualAndEqual(TaskCompleted.class,
// TaskCompleted.person_FIELDNAME, effectivePerson.getDistinguishedName(),
// TaskCompleted.activityToken_FIELDNAME, activityToken) > 0;
// this.hasTaskCompletedWithActivityToken.put(activityToken, o);
// }
// return o;
}
private
boolean
hasTaskWithWork
(
Business
business
,
EffectivePerson
effectivePerson
,
String
work
)
throws
Exception
{
...
...
@@ -197,6 +198,16 @@ class ActionGetWorkOrWorkCompleted extends BaseAction {
return
this
.
hasTaskWithWork
;
}
private
boolean
hasPauseTaskWithWork
(
Business
business
,
EffectivePerson
effectivePerson
,
String
work
)
throws
Exception
{
if
(
null
==
this
.
hasTaskWithWork
)
{
this
.
hasTaskWithWork
=
business
.
entityManagerContainer
().
countEqualAndEqualAndEqual
(
Task
.
class
,
Task
.
person_FIELDNAME
,
effectivePerson
.
getDistinguishedName
(),
Task
.
work_FIELDNAME
,
work
,
Task
.
pause_FIELDNAME
,
true
)
>
0
;
}
return
this
.
hasTaskWithWork
;
}
private
boolean
hasTaskCompletedWithJob
(
Business
business
,
EffectivePerson
effectivePerson
,
String
job
)
throws
Exception
{
if
(
null
==
this
.
hasTaskCompletedWithJob
)
{
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/control/BaseAction.java
浏览文件 @
f13efc31
...
...
@@ -30,14 +30,6 @@ abstract class BaseAction extends StandardJaxrsAction {
// 是否可以重置处理人
private
Boolean
allowReset
=
false
;
public
Boolean
getAllowPause
()
{
return
allowPause
;
}
public
void
setAllowPause
(
Boolean
allowPause
)
{
this
.
allowPause
=
allowPause
;
}
// 是否可以调度
private
Boolean
allowReroute
=
false
;
// 是否可以删除
...
...
@@ -52,11 +44,21 @@ abstract class BaseAction extends StandardJaxrsAction {
private
Boolean
allowPress
=
false
;
// 是否可以待办挂起(暂停待办计时)
private
Boolean
allowPause
=
false
;
// 是否可以取消待办挂起(恢复待办计时)
private
Boolean
allowResume
=
false
;
public
Boolean
getAllowSave
()
{
return
allowSave
;
}
public
Boolean
getAllowPause
()
{
return
allowPause
;
}
public
void
setAllowPause
(
Boolean
allowPause
)
{
this
.
allowPause
=
allowPause
;
}
public
void
setAllowSave
(
Boolean
allowSave
)
{
this
.
allowSave
=
allowSave
;
}
...
...
@@ -141,6 +143,14 @@ abstract class BaseAction extends StandardJaxrsAction {
this
.
allowPress
=
allowPress
;
}
public
Boolean
getAllowResume
()
{
return
allowResume
;
}
public
void
setAllowResume
(
Boolean
allowResume
)
{
this
.
allowResume
=
allowResume
;
}
}
protected
CompletableFuture
<
Boolean
>
checkControlFuture
(
EffectivePerson
effectivePerson
,
String
flag
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录