Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
51245404
o2oa
项目概览
weixin_42566577
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
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,发现更多精彩内容 >>
提交
51245404
编写于
4月 10, 2019
作者:
R
roo00
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复上一环节处理的已办传递到后续环节的问题
上级
381d8291
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
49 addition
and
15 deletion
+49
-15
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/control/ActionGetWorkOrWorkCompleted.java
...e/surface/jaxrs/control/ActionGetWorkOrWorkCompleted.java
+3
-3
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/WorkContext.java
...com/x/processplatform/service/processing/WorkContext.java
+21
-10
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionProcessing.java
...tform/service/processing/jaxrs/task/ActionProcessing.java
+3
-2
o2server/x_program_center/src/main/java/com/x/program/center/schedule/CollectPerson.java
...ain/java/com/x/program/center/schedule/CollectPerson.java
+22
-0
未找到文件。
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/control/ActionGetWorkOrWorkCompleted.java
浏览文件 @
51245404
...
...
@@ -126,14 +126,14 @@ class ActionGetWorkOrWorkCompleted extends BaseAction {
}
}
/* 是否可以召回 */
if
(
PropertyTools
.
getOrElse
(
activity
,
Manual
.
allowRetract_FIELDNAME
,
Boolean
.
class
,
false
)
&&
this
.
canManageApplicationOrProcess
(
business
,
effectivePerson
,
work
.
getApplication
(),
work
.
getProcess
()))
{
if
(
PropertyTools
.
getOrElse
(
activity
,
Manual
.
allowRetract_FIELDNAME
,
Boolean
.
class
,
false
))
{
Node
node
=
this
.
workLogTree
(
business
,
work
.
getJob
()).
location
(
work
);
if
(
null
!=
node
)
{
Nodes
ups
=
node
.
upTo
(
ActivityType
.
manual
,
ActivityType
.
agent
,
ActivityType
.
choice
,
ActivityType
.
delay
,
ActivityType
.
embed
,
ActivityType
.
invoke
);
for
(
Node
o
:
ups
)
{
if
(
this
.
hasTaskCompletedWithActivityToken
(
business
,
effectivePerson
,
work
.
getActivityToken
()))
{
if
(
this
.
hasTaskCompletedWithActivityToken
(
business
,
effectivePerson
,
o
.
getWorkLog
().
getFromActivityToken
()))
{
wo
.
setAllowRetract
(
true
);
break
;
}
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/WorkContext.java
浏览文件 @
51245404
package
com.x.processplatform.service.processing
;
import
java.util.ArrayList
;
import
java.util.Comparator
;
import
java.util.Date
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
...
...
@@ -43,12 +45,12 @@ public class WorkContext {
this
.
processingAttributes
=
aeiObjects
.
getProcessingAttributes
();
}
WorkContext
(
Business
business
,
Work
work
,
Activity
activity
)
throws
Exception
{
this
.
business
=
business
;
this
.
work
=
work
;
this
.
activity
=
activity
;
this
.
gson
=
XGsonBuilder
.
instance
();
}
//
WorkContext(Business business, Work work, Activity activity) throws Exception {
//
this.business = business;
//
this.work = work;
//
this.activity = activity;
//
this.gson = XGsonBuilder.instance();
//
}
WorkContext
(
Business
business
,
Work
work
,
Activity
activity
,
Task
task
)
throws
Exception
{
this
.
business
=
business
;
...
...
@@ -195,9 +197,6 @@ public class WorkContext {
list
.
addAll
(
aeiObjects
.
getTasks
());
list
.
addAll
(
aeiObjects
.
getCreateTasks
());
}
System
.
out
.
println
(
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
);
System
.
out
.
println
(
gson
.
toJson
(
list
));
System
.
out
.
println
(
"!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
);
return
gson
.
toJson
(
list
);
}
catch
(
Exception
e
)
{
throw
new
Exception
(
"getJobTaskList error."
,
e
);
...
...
@@ -273,13 +272,25 @@ public class WorkContext {
}
}
public
String
getTaskOrTaskCompleted
()
{
public
String
getTaskOrTaskCompleted
()
throws
Exception
{
if
(
null
!=
task
)
{
return
gson
.
toJson
(
task
);
}
if
(
null
!=
taskCompleted
)
{
return
gson
.
toJson
(
taskCompleted
);
}
List
<
TaskCompleted
>
list
=
new
ArrayList
<>();
if
(
null
!=
this
.
aeiObjects
)
{
list
.
addAll
(
aeiObjects
.
getTaskCompleteds
());
list
.
addAll
(
aeiObjects
.
getCreateTaskCompleteds
());
}
TaskCompleted
o
=
list
.
stream
().
sorted
(
Comparator
.
comparing
(
TaskCompleted:
:
getCreateTime
,
Comparator
.
nullsLast
(
Date:
:
compareTo
)).
reversed
())
.
findFirst
().
orElse
(
null
);
if
(
null
!=
o
)
{
return
gson
.
toJson
(
o
);
}
return
""
;
}
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionProcessing.java
浏览文件 @
51245404
...
...
@@ -67,7 +67,7 @@ class ActionProcessing extends BaseAction {
if
(
null
!=
work
)
{
WorkDataHelper
workDataHelper
=
new
WorkDataHelper
(
business
.
entityManagerContainer
(),
work
);
data
=
workDataHelper
.
get
();
ScriptHelper
sh
=
ScriptHelperFactory
.
create
(
business
,
work
,
data
,
manual
,
task
);
ScriptHelper
sh
=
ScriptHelperFactory
.
create
WithTask
(
business
,
work
,
data
,
manual
,
task
);
sh
.
eval
(
work
.
getApplication
(),
manual
.
getManualBeforeTaskScript
(),
manual
.
getManualBeforeTaskScriptText
());
if
(
workDataHelper
.
update
(
data
))
{
...
...
@@ -100,7 +100,8 @@ class ActionProcessing extends BaseAction {
if
(
null
!=
work
)
{
WorkDataHelper
workDataHelper
=
new
WorkDataHelper
(
business
.
entityManagerContainer
(),
work
);
data
=
workDataHelper
.
get
();
ScriptHelper
sh
=
ScriptHelperFactory
.
create
(
business
,
work
,
data
,
manual
,
taskCompleted
);
ScriptHelper
sh
=
ScriptHelperFactory
.
createWithTaskCompleted
(
business
,
work
,
data
,
manual
,
taskCompleted
);
sh
.
eval
(
work
.
getApplication
(),
manual
.
getManualAfterTaskScript
(),
manual
.
getManualAfterTaskScriptText
());
if
(
workDataHelper
.
update
(
data
))
{
...
...
o2server/x_program_center/src/main/java/com/x/program/center/schedule/CollectPerson.java
浏览文件 @
51245404
...
...
@@ -41,6 +41,8 @@ public class CollectPerson extends BaseAction {
req
.
setFooter
(
Config
.
collect
().
getFooter
());
req
.
setName
(
Config
.
collect
().
getName
());
req
.
setPassword
(
Config
.
collect
().
getPassword
());
req
.
setSecret
(
Config
.
collect
().
getSecret
());
req
.
setKey
(
Config
.
collect
().
getKey
());
req
.
setMobileList
(
mobiles
);
req
.
setCenterProxyHost
(
Config
.
centerServer
().
getProxyHost
());
if
(
StringUtils
.
isEmpty
(
req
.
getCenterProxyHost
()))
{
...
...
@@ -96,6 +98,10 @@ public class CollectPerson extends BaseAction {
private
String
httpProtocol
;
private
String
secret
;
private
String
key
;
public
String
getName
()
{
return
name
;
}
...
...
@@ -160,6 +166,22 @@ public class CollectPerson extends BaseAction {
this
.
footer
=
footer
;
}
public
String
getSecret
()
{
return
secret
;
}
public
void
setSecret
(
String
secret
)
{
this
.
secret
=
secret
;
}
public
String
getKey
()
{
return
key
;
}
public
void
setKey
(
String
key
)
{
this
.
key
=
key
;
}
}
private
List
<
String
>
listMobile
(
EntityManagerContainer
emc
)
throws
Exception
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录