Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
31bffd2d
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,发现更多精彩内容 >>
提交
31bffd2d
编写于
5月 26, 2022
作者:
Z
zhourui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
添加allowAddTask
上级
d21b44a3
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
51 addition
and
9 deletion
+51
-9
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Portal.java
.../src/main/java/com/x/base/core/project/config/Portal.java
+1
-0
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/control/ActionGetWorkOrWorkCompleted.java
...e/surface/jaxrs/control/ActionGetWorkOrWorkCompleted.java
+3
-1
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/control/BaseAction.java
...ssplatform/assemble/surface/jaxrs/control/BaseAction.java
+10
-1
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/V2Add.java
.../x/processplatform/assemble/surface/jaxrs/task/V2Add.java
+2
-2
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/V2Reset.java
.../processplatform/assemble/surface/jaxrs/task/V2Reset.java
+1
-1
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2AddManualTaskIdentityMatrix.java
...ble/surface/jaxrs/work/V2AddManualTaskIdentityMatrix.java
+1
-1
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Manual.java
...ava/com/x/processplatform/core/entity/element/Manual.java
+19
-0
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/ManualProperties.java
...processplatform/core/entity/element/ManualProperties.java
+11
-0
o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/service/processing/jaxrs/work/V2AddManualTaskIdentityMatrixWi.java
...rocessing/jaxrs/work/V2AddManualTaskIdentityMatrixWi.java
+2
-2
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2AddManualTaskIdentityMatrix.java
.../processing/jaxrs/work/V2AddManualTaskIdentityMatrix.java
+1
-1
未找到文件。
o2server/x_base_core_project/src/main/java/com/x/base/core/project/config/Portal.java
浏览文件 @
31bffd2d
...
@@ -23,6 +23,7 @@ public class Portal extends ConfigObject {
...
@@ -23,6 +23,7 @@ public class Portal extends ConfigObject {
}
}
@FieldDescribe
(
"url转换配置."
)
@FieldDescribe
(
"url转换配置."
)
@Deprecated
(
since
=
"7.2"
,
forRemoval
=
true
)
private
LinkedHashMap
<
String
,
String
>
urlMapping
;
private
LinkedHashMap
<
String
,
String
>
urlMapping
;
@FieldDescribe
(
"定制首页面设置."
)
@FieldDescribe
(
"定制首页面设置."
)
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/control/ActionGetWorkOrWorkCompleted.java
浏览文件 @
31bffd2d
...
@@ -112,6 +112,9 @@ class ActionGetWorkOrWorkCompleted extends BaseAction {
...
@@ -112,6 +112,9 @@ class ActionGetWorkOrWorkCompleted extends BaseAction {
// 是否可以重置处理人
// 是否可以重置处理人
wo
.
setAllowReset
(
PropertyTools
.
getOrElse
(
activity
,
Manual
.
allowReset_FIELDNAME
,
Boolean
.
class
,
false
)
wo
.
setAllowReset
(
PropertyTools
.
getOrElse
(
activity
,
Manual
.
allowReset_FIELDNAME
,
Boolean
.
class
,
false
)
&&
wo
.
getAllowSave
());
&&
wo
.
getAllowSave
());
// 是否可以加签
wo
.
setAllowAddTask
(
PropertyTools
.
getOrElse
(
activity
,
Manual
.
ALLOWADDTASK_FIELDNAME
,
Boolean
.
class
,
false
)
&&
wo
.
getAllowAddTask
());
// 是否可以调度
// 是否可以调度
wo
.
setAllowReroute
(
PropertyTools
.
getOrElse
(
activity
,
Activity
.
allowReroute_FIELDNAME
,
Boolean
.
class
,
false
)
wo
.
setAllowReroute
(
PropertyTools
.
getOrElse
(
activity
,
Activity
.
allowReroute_FIELDNAME
,
Boolean
.
class
,
false
)
&&
this
.
canManageApplicationOrProcess
(
business
,
effectivePerson
,
work
.
getApplication
(),
&&
this
.
canManageApplicationOrProcess
(
business
,
effectivePerson
,
work
.
getApplication
(),
...
@@ -170,7 +173,6 @@ class ActionGetWorkOrWorkCompleted extends BaseAction {
...
@@ -170,7 +173,6 @@ class ActionGetWorkOrWorkCompleted extends BaseAction {
&&
this
.
hasTaskCompletedWithJob
(
business
,
effectivePerson
,
work
.
getJob
()));
&&
this
.
hasTaskCompletedWithJob
(
business
,
effectivePerson
,
work
.
getJob
()));
// 是否可以看到
// 是否可以看到
wo
.
setAllowVisit
(
true
);
wo
.
setAllowVisit
(
true
);
return
wo
;
return
wo
;
}
}
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/control/BaseAction.java
浏览文件 @
31bffd2d
...
@@ -30,7 +30,8 @@ abstract class BaseAction extends StandardJaxrsAction {
...
@@ -30,7 +30,8 @@ abstract class BaseAction extends StandardJaxrsAction {
private
Boolean
allowSave
=
false
;
private
Boolean
allowSave
=
false
;
// 是否可以重置处理人
// 是否可以重置处理人
private
Boolean
allowReset
=
false
;
private
Boolean
allowReset
=
false
;
// 是否可以加签
private
Boolean
allowAddTask
=
false
;
// 是否可以调度
// 是否可以调度
private
Boolean
allowReroute
=
false
;
private
Boolean
allowReroute
=
false
;
// 是否可以删除
// 是否可以删除
...
@@ -152,6 +153,14 @@ abstract class BaseAction extends StandardJaxrsAction {
...
@@ -152,6 +153,14 @@ abstract class BaseAction extends StandardJaxrsAction {
this
.
allowResume
=
allowResume
;
this
.
allowResume
=
allowResume
;
}
}
public
Boolean
getAllowAddTask
()
{
return
allowAddTask
;
}
public
void
setAllowAddTask
(
Boolean
allowAddTask
)
{
this
.
allowAddTask
=
allowAddTask
;
}
}
}
protected
CompletableFuture
<
Boolean
>
checkControlFuture
(
EffectivePerson
effectivePerson
,
String
flag
)
{
protected
CompletableFuture
<
Boolean
>
checkControlFuture
(
EffectivePerson
effectivePerson
,
String
flag
)
{
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/V2Add.java
浏览文件 @
31bffd2d
...
@@ -37,11 +37,11 @@ import com.x.processplatform.core.entity.content.Work;
...
@@ -37,11 +37,11 @@ import com.x.processplatform.core.entity.content.Work;
import
com.x.processplatform.core.entity.content.WorkCompleted
;
import
com.x.processplatform.core.entity.content.WorkCompleted
;
import
com.x.processplatform.core.entity.content.WorkLog
;
import
com.x.processplatform.core.entity.content.WorkLog
;
import
com.x.processplatform.core.express.ProcessingAttributes
;
import
com.x.processplatform.core.express.ProcessingAttributes
;
import
com.x.processplatform.core.express.assemble.surface.jaxrs.work.V2AddManualTaskIdentityMatrixWi
;
import
com.x.processplatform.core.express.assemble.surface.jaxrs.work.V2AddManualTaskIdentityMatrixWi.Option
;
import
com.x.processplatform.core.express.service.processing.jaxrs.task.ProcessingWi
;
import
com.x.processplatform.core.express.service.processing.jaxrs.task.ProcessingWi
;
import
com.x.processplatform.core.express.service.processing.jaxrs.task.WrapUpdatePrevTaskIdentity
;
import
com.x.processplatform.core.express.service.processing.jaxrs.task.WrapUpdatePrevTaskIdentity
;
import
com.x.processplatform.core.express.service.processing.jaxrs.taskcompleted.WrapUpdateNextTaskIdentity
;
import
com.x.processplatform.core.express.service.processing.jaxrs.taskcompleted.WrapUpdateNextTaskIdentity
;
import
com.x.processplatform.core.express.service.processing.jaxrs.work.V2AddManualTaskIdentityMatrixWi
;
import
com.x.processplatform.core.express.service.processing.jaxrs.work.V2AddManualTaskIdentityMatrixWi.Option
;
public
class
V2Add
extends
BaseAction
{
public
class
V2Add
extends
BaseAction
{
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/task/V2Reset.java
浏览文件 @
31bffd2d
...
@@ -38,9 +38,9 @@ import com.x.processplatform.core.entity.element.ActivityType;
...
@@ -38,9 +38,9 @@ import com.x.processplatform.core.entity.element.ActivityType;
import
com.x.processplatform.core.entity.element.Manual
;
import
com.x.processplatform.core.entity.element.Manual
;
import
com.x.processplatform.core.entity.element.ManualMode
;
import
com.x.processplatform.core.entity.element.ManualMode
;
import
com.x.processplatform.core.express.ProcessingAttributes
;
import
com.x.processplatform.core.express.ProcessingAttributes
;
import
com.x.processplatform.core.express.assemble.surface.jaxrs.work.V2AddManualTaskIdentityMatrixWi
;
import
com.x.processplatform.core.express.service.processing.jaxrs.task.ProcessingWi
;
import
com.x.processplatform.core.express.service.processing.jaxrs.task.ProcessingWi
;
import
com.x.processplatform.core.express.service.processing.jaxrs.task.V2ResetWi
;
import
com.x.processplatform.core.express.service.processing.jaxrs.task.V2ResetWi
;
import
com.x.processplatform.core.express.service.processing.jaxrs.work.V2AddManualTaskIdentityMatrixWi
;
public
class
V2Reset
extends
BaseAction
{
public
class
V2Reset
extends
BaseAction
{
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/work/V2AddManualTaskIdentityMatrix.java
浏览文件 @
31bffd2d
...
@@ -24,7 +24,7 @@ import com.x.processplatform.assemble.surface.ThisApplication;
...
@@ -24,7 +24,7 @@ import com.x.processplatform.assemble.surface.ThisApplication;
import
com.x.processplatform.assemble.surface.WorkControl
;
import
com.x.processplatform.assemble.surface.WorkControl
;
import
com.x.processplatform.core.entity.content.Work
;
import
com.x.processplatform.core.entity.content.Work
;
import
com.x.processplatform.core.express.ProcessingAttributes
;
import
com.x.processplatform.core.express.ProcessingAttributes
;
import
com.x.processplatform.core.express.
assemble.surface
.jaxrs.work.V2AddManualTaskIdentityMatrixWi
;
import
com.x.processplatform.core.express.
service.processing
.jaxrs.work.V2AddManualTaskIdentityMatrixWi
;
class
V2AddManualTaskIdentityMatrix
extends
BaseAction
{
class
V2AddManualTaskIdentityMatrix
extends
BaseAction
{
...
...
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/Manual.java
浏览文件 @
31bffd2d
...
@@ -73,6 +73,7 @@ public class Manual extends Activity {
...
@@ -73,6 +73,7 @@ public class Manual extends Activity {
public
void
postLoad
()
{
public
void
postLoad
()
{
if
(
null
!=
this
.
properties
)
{
if
(
null
!=
this
.
properties
)
{
this
.
customData
=
this
.
getProperties
().
getCustomData
();
this
.
customData
=
this
.
getProperties
().
getCustomData
();
this
.
allowAddTask
=
this
.
getProperties
().
getAllowAddTask
();
}
}
}
}
...
@@ -110,6 +111,24 @@ public class Manual extends Activity {
...
@@ -110,6 +111,24 @@ public class Manual extends Activity {
this
.
properties
.
setCustomData
(
customData
);
this
.
properties
.
setCustomData
(
customData
);
}
}
public
static
final
String
ALLOWADDTASK_FIELDNAME
=
"allowAddTask"
;
@Transient
@FieldDescribe
(
"是否允许加签"
)
private
Boolean
allowAddTask
;
public
Boolean
getAllowAddTask
()
{
if
(
null
!=
this
.
allowAddTask
)
{
return
this
.
allowAddTask
;
}
else
{
return
this
.
getProperties
().
getAllowAddTask
();
}
}
public
void
setAllowAddTask
(
Boolean
allowAddTask
)
{
this
.
allowAddTask
=
allowAddTask
;
this
.
properties
.
setAllowAddTask
(
allowAddTask
);
}
public
ManualTaskIdentityMatrix
identitiesToManualTaskIdentityMatrix
(
List
<
String
>
identities
)
{
public
ManualTaskIdentityMatrix
identitiesToManualTaskIdentityMatrix
(
List
<
String
>
identities
)
{
switch
(
this
.
getManualMode
())
{
switch
(
this
.
getManualMode
())
{
case
parallel:
case
parallel:
...
...
o2server/x_processplatform_core_entity/src/main/java/com/x/processplatform/core/entity/element/ManualProperties.java
浏览文件 @
31bffd2d
...
@@ -10,6 +10,9 @@ public class ManualProperties extends JsonProperties {
...
@@ -10,6 +10,9 @@ public class ManualProperties extends JsonProperties {
@FieldDescribe
(
"活动自定义数据"
)
@FieldDescribe
(
"活动自定义数据"
)
private
JsonElement
customData
;
private
JsonElement
customData
;
@FieldDescribe
(
"是否允许加签"
)
private
Boolean
allowAddTask
;
public
JsonElement
getCustomData
()
{
public
JsonElement
getCustomData
()
{
return
customData
;
return
customData
;
}
}
...
@@ -18,4 +21,12 @@ public class ManualProperties extends JsonProperties {
...
@@ -18,4 +21,12 @@ public class ManualProperties extends JsonProperties {
this
.
customData
=
customData
;
this
.
customData
=
customData
;
}
}
public
Boolean
getAllowAddTask
()
{
return
allowAddTask
;
}
public
void
setAllowAddTask
(
Boolean
allowAddTask
)
{
this
.
allowAddTask
=
allowAddTask
;
}
}
}
o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/
assemble/surface
/jaxrs/work/V2AddManualTaskIdentityMatrixWi.java
→
o2server/x_processplatform_core_express/src/main/java/com/x/processplatform/core/express/
service/processing
/jaxrs/work/V2AddManualTaskIdentityMatrixWi.java
浏览文件 @
31bffd2d
package
com.x.processplatform.core.express.
assemble.surface
.jaxrs.work
;
package
com.x.processplatform.core.express.
service.processing
.jaxrs.work
;
import
java.util.List
;
import
java.util.List
;
...
@@ -46,7 +46,7 @@ public class V2AddManualTaskIdentityMatrixWi extends GsonPropertyObject {
...
@@ -46,7 +46,7 @@ public class V2AddManualTaskIdentityMatrixWi extends GsonPropertyObject {
public
static
class
Option
{
public
static
class
Option
{
@FieldDescribe
(
"位置,before,after,
first,last
,extend"
)
@FieldDescribe
(
"位置,before,after,
top,bottom
,extend"
)
private
String
position
;
private
String
position
;
@FieldDescribe
(
"身份"
)
@FieldDescribe
(
"身份"
)
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/V2AddManualTaskIdentityMatrix.java
浏览文件 @
31bffd2d
...
@@ -22,7 +22,7 @@ import com.x.base.core.project.logger.LoggerFactory;
...
@@ -22,7 +22,7 @@ import com.x.base.core.project.logger.LoggerFactory;
import
com.x.base.core.project.processplatform.ManualTaskIdentityMatrix
;
import
com.x.base.core.project.processplatform.ManualTaskIdentityMatrix
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.processplatform.core.entity.content.Work
;
import
com.x.processplatform.core.entity.content.Work
;
import
com.x.processplatform.core.express.
assemble.surface
.jaxrs.work.V2AddManualTaskIdentityMatrixWi
;
import
com.x.processplatform.core.express.
service.processing
.jaxrs.work.V2AddManualTaskIdentityMatrixWi
;
import
com.x.processplatform.service.processing.Business
;
import
com.x.processplatform.service.processing.Business
;
class
V2AddManualTaskIdentityMatrix
extends
BaseAction
{
class
V2AddManualTaskIdentityMatrix
extends
BaseAction
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录