Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
开发团队
Flowable Engine
提交
19ee0399
F
Flowable Engine
项目概览
开发团队
/
Flowable Engine
通知
9
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Flowable Engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
19ee0399
编写于
6月 11, 2013
作者:
F
frederikheremans
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #84 from balsarori/actmaster
Relative Due Date for User Task
上级
f280820d
60454e3a
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
47 addition
and
0 deletion
+47
-0
modules/activiti-engine/src/main/java/org/activiti/engine/impl/calendar/DueDateBusinessCalendar.java
...ctiviti/engine/impl/calendar/DueDateBusinessCalendar.java
+7
-0
modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/usertask/TaskDueDateExtensionsTest.java
.../engine/test/bpmn/usertask/TaskDueDateExtensionsTest.java
+19
-0
modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/usertask/TaskDueDateExtensionsTest.testRelativeDueDateStringExtension.bpmn20.xml
...ensionsTest.testRelativeDueDateStringExtension.bpmn20.xml
+21
-0
未找到文件。
modules/activiti-engine/src/main/java/org/activiti/engine/impl/calendar/DueDateBusinessCalendar.java
浏览文件 @
19ee0399
...
@@ -16,6 +16,7 @@ import java.util.Date;
...
@@ -16,6 +16,7 @@ import java.util.Date;
import
org.activiti.engine.ActivitiException
;
import
org.activiti.engine.ActivitiException
;
import
org.joda.time.DateTime
;
import
org.joda.time.DateTime
;
import
org.joda.time.Period
;
public
class
DueDateBusinessCalendar
implements
BusinessCalendar
{
public
class
DueDateBusinessCalendar
implements
BusinessCalendar
{
...
@@ -24,6 +25,12 @@ public class DueDateBusinessCalendar implements BusinessCalendar {
...
@@ -24,6 +25,12 @@ public class DueDateBusinessCalendar implements BusinessCalendar {
public
Date
resolveDuedate
(
String
duedate
)
{
public
Date
resolveDuedate
(
String
duedate
)
{
try
{
try
{
// check if due period was specified
if
(
duedate
.
startsWith
(
"P"
)){
return
DateTime
.
now
().
plus
(
Period
.
parse
(
duedate
)).
toDate
();
}
return
DateTime
.
parse
(
duedate
).
toDate
();
return
DateTime
.
parse
(
duedate
).
toDate
();
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
modules/activiti-engine/src/test/java/org/activiti/engine/test/bpmn/usertask/TaskDueDateExtensionsTest.java
浏览文件 @
19ee0399
...
@@ -22,6 +22,7 @@ import org.activiti.engine.impl.test.PluggableActivitiTestCase;
...
@@ -22,6 +22,7 @@ import org.activiti.engine.impl.test.PluggableActivitiTestCase;
import
org.activiti.engine.runtime.ProcessInstance
;
import
org.activiti.engine.runtime.ProcessInstance
;
import
org.activiti.engine.task.Task
;
import
org.activiti.engine.task.Task
;
import
org.activiti.engine.test.Deployment
;
import
org.activiti.engine.test.Deployment
;
import
org.joda.time.Period
;
/**
/**
...
@@ -60,4 +61,22 @@ public class TaskDueDateExtensionsTest extends PluggableActivitiTestCase {
...
@@ -60,4 +61,22 @@ public class TaskDueDateExtensionsTest extends PluggableActivitiTestCase {
Date
date
=
new
SimpleDateFormat
(
"dd-MM-yyyy HH:mm:ss"
).
parse
(
"06-07-1986 12:10:00"
);
Date
date
=
new
SimpleDateFormat
(
"dd-MM-yyyy HH:mm:ss"
).
parse
(
"06-07-1986 12:10:00"
);
assertEquals
(
date
,
task
.
getDueDate
());
assertEquals
(
date
,
task
.
getDueDate
());
}
}
@Deployment
public
void
testRelativeDueDateStringExtension
()
throws
Exception
{
Map
<
String
,
Object
>
variables
=
new
HashMap
<
String
,
Object
>();
variables
.
put
(
"dateVariable"
,
"P2DT5H40M"
);
// Start process-instance, passing ISO8601 duration formatted String that should be used to calculate dueDate
ProcessInstance
processInstance
=
runtimeService
.
startProcessInstanceByKey
(
"dueDateExtension"
,
variables
);
Task
task
=
taskService
.
createTaskQuery
().
processInstanceId
(
processInstance
.
getId
()).
singleResult
();
assertNotNull
(
task
.
getDueDate
());
Period
period
=
new
Period
(
task
.
getCreateTime
().
getTime
(),
task
.
getDueDate
().
getTime
());
assertEquals
(
period
.
getDays
(),
2
);
assertEquals
(
period
.
getHours
(),
5
);
assertEquals
(
period
.
getMinutes
(),
40
);
}
}
}
modules/activiti-engine/src/test/resources/org/activiti/engine/test/bpmn/usertask/TaskDueDateExtensionsTest.testRelativeDueDateStringExtension.bpmn20.xml
0 → 100644
浏览文件 @
19ee0399
<?xml version="1.0" encoding="UTF-8"?>
<definitions
id=
"taskAssigneeExample"
xmlns=
"http://www.omg.org/spec/BPMN/20100524/MODEL"
xmlns:activiti=
"http://activiti.org/bpmn"
targetNamespace=
"Examples"
>
<process
id=
"dueDateExtension"
>
<startEvent
id=
"theStart"
/>
<sequenceFlow
id=
"flow1"
sourceRef=
"theStart"
targetRef=
"theTask"
/>
<userTask
id=
"theTask"
name=
"my task"
activiti:dueDate=
"${dateVariable}"
/>
<sequenceFlow
id=
"flow2"
sourceRef=
"theTask"
targetRef=
"theEnd"
/>
<endEvent
id=
"theEnd"
/>
</process>
</definitions>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录