Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
ec12eaa5
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,发现更多精彩内容 >>
提交
ec12eaa5
编写于
4月 14, 2020
作者:
L
luojing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改定时检查是否超时
上级
e1990b61
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
37 addition
and
1 deletion
+37
-1
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/timertask/Timertask_CheckAllTaskOverTime.java
...ble/control/timertask/Timertask_CheckAllTaskOverTime.java
+37
-1
未找到文件。
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/timertask/Timertask_CheckAllTaskOverTime.java
浏览文件 @
ec12eaa5
...
@@ -13,9 +13,11 @@ import com.x.base.core.project.logger.Logger;
...
@@ -13,9 +13,11 @@ import com.x.base.core.project.logger.Logger;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.schedule.AbstractJob
;
import
com.x.base.core.project.schedule.AbstractJob
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.teamwork.assemble.control.Business
;
import
com.x.teamwork.assemble.control.service.MessageFactory
;
import
com.x.teamwork.assemble.control.service.MessageFactory
;
import
com.x.teamwork.assemble.control.service.ProjectQueryService
;
import
com.x.teamwork.assemble.control.service.ProjectQueryService
;
import
com.x.teamwork.assemble.control.service.TaskQueryService
;
import
com.x.teamwork.assemble.control.service.TaskQueryService
;
import
com.x.teamwork.core.entity.Review
;
import
com.x.teamwork.core.entity.Task
;
import
com.x.teamwork.core.entity.Task
;
/**
/**
...
@@ -45,6 +47,7 @@ public class Timertask_CheckAllTaskOverTime extends AbstractJob {
...
@@ -45,6 +47,7 @@ public class Timertask_CheckAllTaskOverTime extends AbstractJob {
try
{
try
{
taskIds
=
taskQueryService
.
listAllTaskIdsWithProject
(
projectId
);
taskIds
=
taskQueryService
.
listAllTaskIdsWithProject
(
projectId
);
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
if
(
ListTools
.
isNotEmpty
(
taskIds
))
{
if
(
ListTools
.
isNotEmpty
(
taskIds
))
{
for
(
String
taskId
:
taskIds
)
{
for
(
String
taskId
:
taskIds
)
{
task
=
emc
.
find
(
taskId
,
Task
.
class
);
task
=
emc
.
find
(
taskId
,
Task
.
class
);
...
@@ -59,6 +62,22 @@ public class Timertask_CheckAllTaskOverTime extends AbstractJob {
...
@@ -59,6 +62,22 @@ public class Timertask_CheckAllTaskOverTime extends AbstractJob {
emc
.
check
(
task
,
CheckPersistType
.
all
);
emc
.
check
(
task
,
CheckPersistType
.
all
);
emc
.
commit
();
emc
.
commit
();
//同时修改对应Review文档
List
<
String
>
subTaskReviewIds
=
null
;
List
<
Review
>
subTaskReviews
=
null
;
subTaskReviewIds
=
business
.
reviewFactory
().
listReviewByTask
(
taskId
,
999
);
if
(
ListTools
.
isNotEmpty
(
subTaskReviewIds
)
)
{
subTaskReviews
=
emc
.
list
(
Review
.
class
,
subTaskReviewIds
);
if
(
ListTools
.
isNotEmpty
(
subTaskReviews
))
{
emc
.
beginTransaction
(
Task
.
class
);
for
(
Review
review
:
subTaskReviews
)
{
review
.
setOvertime
(
true
);
emc
.
check
(
review
,
CheckPersistType
.
all
);
}
emc
.
commit
();
}
}
try
{
try
{
MessageFactory
.
message_to_teamWorkOverTime
(
task
,
true
);
MessageFactory
.
message_to_teamWorkOverTime
(
task
,
true
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
@@ -66,11 +85,28 @@ public class Timertask_CheckAllTaskOverTime extends AbstractJob {
...
@@ -66,11 +85,28 @@ public class Timertask_CheckAllTaskOverTime extends AbstractJob {
}
}
}
}
if
(
task
.
getEndTime
().
after
(
now
)
&&
task
.
getOvertime
())
{
if
(
task
.
getEndTime
().
after
(
now
)
&&
task
.
getOvertime
())
{
logger
.
debug
(
"超时变未超时,打上标识,不发送提醒"
);
//超时变未超时,打上标识,不发送提醒
//超时变未超时,打上标识,不发送提醒
emc
.
beginTransaction
(
Task
.
class
);
emc
.
beginTransaction
(
Task
.
class
);
task
.
setOvertime
(
false
);
task
.
setOvertime
(
false
);
emc
.
check
(
task
,
CheckPersistType
.
all
);
emc
.
check
(
task
,
CheckPersistType
.
all
);
emc
.
commit
();
emc
.
commit
();
//同时修改对应Review文档
List
<
String
>
subTaskReviewIds
=
null
;
List
<
Review
>
subTaskReviews
=
null
;
subTaskReviewIds
=
business
.
reviewFactory
().
listReviewByTask
(
taskId
,
999
);
if
(
ListTools
.
isNotEmpty
(
subTaskReviewIds
)
)
{
subTaskReviews
=
emc
.
list
(
Review
.
class
,
subTaskReviewIds
);
if
(
ListTools
.
isNotEmpty
(
subTaskReviews
))
{
emc
.
beginTransaction
(
Review
.
class
);
for
(
Review
review
:
subTaskReviews
)
{
review
.
setOvertime
(
false
);
emc
.
check
(
review
,
CheckPersistType
.
all
);
}
emc
.
commit
();
}
}
}
}
Date
now_30
=
DateUtils
.
addMinutes
(
task
.
getEndTime
(),
-
30
);
Date
now_30
=
DateUtils
.
addMinutes
(
task
.
getEndTime
(),
-
30
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录