Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
浙江兰德纵横网络技术股份有限公司
o2oa
提交
66ea3a4b
o2oa
项目概览
浙江兰德纵横网络技术股份有限公司
/
o2oa
通知
333
Star
10
Fork
6
代码
文件
提交
分支
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,体验更适合开发者的 AI 搜索 >>
提交
66ea3a4b
编写于
11月 29, 2023
作者:
O
o2sword
2
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复人员权限交接替换模式新旧版待办机制兼容处理
上级
1e61180d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
21 deletion
+27
-21
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionReplace.java
...platform/service/processing/jaxrs/task/ActionReplace.java
+22
-20
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/schedule/HandoverJob.java
...cessplatform/service/processing/schedule/HandoverJob.java
+5
-1
未找到文件。
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/task/ActionReplace.java
浏览文件 @
66ea3a4b
package
com.x.processplatform.service.processing.jaxrs.task
;
import
java.util.List
;
import
java.util.Optional
;
import
java.util.concurrent.Callable
;
import
java.util.concurrent.TimeUnit
;
import
com.x.processplatform.core.entity.ticket.Ticket
;
import
org.apache.commons.lang3.StringUtils
;
import
com.google.gson.JsonElement
;
...
...
@@ -82,6 +84,7 @@ class ActionReplace extends BaseAction {
@Override
public
ActionResult
<
Wo
>
call
()
throws
Exception
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
Wo
wo
=
new
Wo
();
wo
.
setValue
(
true
);
Task
task
=
emc
.
find
(
id
,
Task
.
class
);
...
...
@@ -92,31 +95,30 @@ class ActionReplace extends BaseAction {
}
emc
.
beginTransaction
(
Work
.
class
);
emc
.
beginTransaction
(
Task
.
class
);
emc
.
beginTransaction
(
TaskCompleted
.
class
);
emc
.
beginTransaction
(
Review
.
class
);
String
taskJson
=
XGsonBuilder
.
instance
().
toJson
(
work
.
getManualTaskIdentityMatrix
());
if
(
StringUtils
.
isNotBlank
(
taskJson
)
&&
taskJson
.
indexOf
(
task
.
getIdentity
())
>
-
1
)
{
taskJson
=
taskJson
.
replace
(
task
.
getIdentity
(),
wi
.
getTargetIdentity
());
work
.
setManualTaskIdentityMatrix
(
XGsonBuilder
.
instance
().
fromJson
(
taskJson
,
ManualTaskIdentityMatrix
.
class
));
if
(
StringUtils
.
isBlank
(
task
.
getLabel
()))
{
String
taskJson
=
XGsonBuilder
.
instance
().
toJson
(
work
.
getManualTaskIdentityMatrix
());
if
(
StringUtils
.
isNotBlank
(
taskJson
)
&&
taskJson
.
indexOf
(
task
.
getIdentity
())
>
-
1
)
{
taskJson
=
taskJson
.
replace
(
task
.
getIdentity
(),
wi
.
getTargetIdentity
());
work
.
setManualTaskIdentityMatrix
(
XGsonBuilder
.
instance
().
fromJson
(
taskJson
,
ManualTaskIdentityMatrix
.
class
));
}
task
.
setPerson
(
wi
.
getTargetPerson
());
task
.
setIdentity
(
wi
.
getTargetIdentity
());
}
else
{
Long
count
=
emc
.
countEqualAndEqual
(
Task
.
class
,
Task
.
identity_FIELDNAME
,
wi
.
getTargetIdentity
(),
Task
.
work_FIELDNAME
,
task
.
getWork
());
if
(
count
>
0
)
{
work
.
getTickets
().
disableDistinguishedName
(
wi
.
getTargetIdentity
());
emc
.
remove
(
task
);
}
else
{
work
.
getTickets
().
reset
(
task
.
getLabel
(),
List
.
of
(
wi
.
getTargetIdentity
()));
task
.
setPerson
(
wi
.
getTargetPerson
());
task
.
setIdentity
(
wi
.
getTargetIdentity
());
}
}
if
(
work
.
getCreatorPerson
().
equals
(
wi
.
getPerson
()))
{
work
.
setCreatorPerson
(
wi
.
getTargetPerson
());
work
.
setCreatorIdentity
(
wi
.
getTargetIdentity
());
}
List
<
TaskCompleted
>
taskCompletedList
=
emc
.
listEqualAndEqual
(
TaskCompleted
.
class
,
TaskCompleted
.
person_FIELDNAME
,
task
.
getPerson
(),
TaskCompleted
.
job_FIELDNAME
,
task
.
getJob
());
taskCompletedList
.
stream
().
forEach
(
o
->
{
o
.
setPerson
(
wi
.
getTargetPerson
());
o
.
setIdentity
(
wi
.
getTargetIdentity
());
});
List
<
Review
>
reviewList
=
emc
.
listEqualAndEqual
(
Review
.
class
,
Review
.
person_FIELDNAME
,
task
.
getPerson
(),
Review
.
job_FIELDNAME
,
task
.
getJob
());
reviewList
.
stream
().
forEach
(
o
->
o
.
setPerson
(
wi
.
getTargetPerson
()));
task
.
setPerson
(
wi
.
getTargetPerson
());
task
.
setIdentity
(
wi
.
getTargetIdentity
());
emc
.
commit
();
}
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/schedule/HandoverJob.java
浏览文件 @
66ea3a4b
...
...
@@ -120,12 +120,16 @@ public class HandoverJob extends AbstractJob {
list
=
listReview
(
business
,
handover
);
for
(
String
id
:
list
){
Review
review
=
emc
.
find
(
id
,
Review
.
class
);
emc
.
beginTransaction
(
Review
.
class
);
if
(!
hasReview
(
business
,
review
.
getJob
(),
handover
.
getTargetPerson
())){
emc
.
beginTransaction
(
Review
.
class
);
review
.
setPerson
(
handover
.
getTargetPerson
());
emc
.
commit
();
jobSet
.
add
(
review
.
getJob
());
}
else
{
emc
.
remove
(
review
);
}
emc
.
commit
();
jobSet
.
add
(
review
.
getJob
());
}
list
=
listDraft
(
business
,
handover
);
for
(
String
id
:
list
){
...
...
liyi_hz2008
@liyi_hz2008
mentioned in commit
1caec7e9
·
11月 29, 2023
mentioned in commit
1caec7e9
mentioned in commit 1caec7e97739249868f4fcc422fab1732d5ac67f
开关提交列表
NoSubject
@NoSubject
mentioned in commit
fb7f37db
·
11月 29, 2023
mentioned in commit
fb7f37db
mentioned in commit fb7f37dbfa9f5f390eadd1d70822796af2cdf89e
开关提交列表
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录