Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
此号慢热型
o2oa
提交
0b7599d8
o2oa
项目概览
此号慢热型
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
5
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,体验更适合开发者的 AI 搜索 >>
提交
0b7599d8
编写于
5月 25, 2020
作者:
L
luojing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
teamwork后台服务
上级
da010299
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
11 deletion
+33
-11
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/global/ActionProjectConfigGetByProject.java
...control/jaxrs/global/ActionProjectConfigGetByProject.java
+7
-10
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/global/GlobalAction.java
.../teamwork/assemble/control/jaxrs/global/GlobalAction.java
+1
-1
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionListNextWithFilter.java
...emble/control/jaxrs/project/ActionListNextWithFilter.java
+25
-0
未找到文件。
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/global/ActionProjectConfigGetByProject.java
浏览文件 @
0b7599d8
...
...
@@ -24,10 +24,11 @@ public class ActionProjectConfigGetByProject extends BaseAction {
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ActionProjectConfigGetByProject
.
class
);
protected
ActionResult
<
List
<
Wo
>
>
execute
(
HttpServletRequest
request
,
EffectivePerson
effectivePerson
,
String
id
)
throws
Exception
{
ActionResult
<
List
<
Wo
>>
result
=
new
ActionResult
<
List
<
Wo
>
>();
List
<
Wo
>
wo
=
null
;
protected
ActionResult
<
Wo
>
execute
(
HttpServletRequest
request
,
EffectivePerson
effectivePerson
,
String
id
)
throws
Exception
{
ActionResult
<
Wo
>
result
=
new
ActionResult
<
Wo
>();
Wo
wo
=
null
;
List
<
ProjectConfig
>
projectConfigs
=
null
;
ProjectConfig
projectConfig
=
null
;
Boolean
check
=
true
;
if
(
StringUtils
.
isEmpty
(
id
)
)
{
...
...
@@ -39,9 +40,10 @@ public class ActionProjectConfigGetByProject extends BaseAction {
if
(
Boolean
.
TRUE
.
equals
(
check
)
){
try
{
projectConfigs
=
projectConfigQueryService
.
getProjectConfigByProject
(
id
);
/*
if(ListTools.isNotEmpty(projectConfigs)){
if
(
ListTools
.
isNotEmpty
(
projectConfigs
)){
projectConfig
=
projectConfigs
.
get
(
0
);
}
/*
if ( projectConfig == null) {
check = false;
Exception exception = new ProjectConfigNotExistsException( id );
...
...
@@ -57,13 +59,8 @@ public class ActionProjectConfigGetByProject extends BaseAction {
if
(
Boolean
.
TRUE
.
equals
(
check
)
){
try
{
if
(
ListTools
.
isEmpty
(
projectConfigs
)){
wo
=
new
ArrayList
<
Wo
>();
wo
=
Wo
.
copier
.
copy
(
projectConfig
);
result
.
setData
(
wo
);
}
else
{
wo
=
Wo
.
copier
.
copy
(
projectConfigs
);
result
.
setData
(
wo
);
}
}
catch
(
Exception
e
)
{
Exception
exception
=
new
ProjectConfigQueryException
(
e
,
"将查询出来的项目配置信息对象转换为可输出的数据信息时发生异常。"
);
...
...
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/global/GlobalAction.java
浏览文件 @
0b7599d8
...
...
@@ -213,7 +213,7 @@ public class GlobalAction extends StandardJaxrsAction {
public
void
projectConfigGetByProject
(
@Suspended
final
AsyncResponse
asyncResponse
,
@Context
HttpServletRequest
request
,
@JaxrsParameterDescribe
(
"项目ID"
)
@PathParam
(
"id"
)
String
id
)
{
ActionResult
<
List
<
ActionProjectConfigGetByProject
.
Wo
>
>
result
=
new
ActionResult
<>();
ActionResult
<
ActionProjectConfigGetByProject
.
Wo
>
result
=
new
ActionResult
<>();
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionProjectConfigGetByProject
().
execute
(
request
,
effectivePerson
,
id
);
...
...
o2server/x_teamwork_assemble_control/src/main/java/com/x/teamwork/assemble/control/jaxrs/project/ActionListNextWithFilter.java
浏览文件 @
0b7599d8
...
...
@@ -21,6 +21,7 @@ import com.x.base.core.project.logger.LoggerFactory;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.teamwork.assemble.control.Business
;
import
com.x.teamwork.core.entity.Project
;
import
com.x.teamwork.core.entity.ProjectConfig
;
import
com.x.teamwork.core.entity.tools.filter.QueryFilter
;
import
com.x.teamwork.core.entity.tools.filter.term.InTerm
;
...
...
@@ -105,13 +106,34 @@ public class ActionListNextWithFilter extends BaseAction {
try
(
EntityManagerContainer
bc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
business
=
new
Business
(
bc
);
}
//查询项目配置信息
List
<
ProjectConfig
>
projectConfigs
=
null
;
projectConfigs
=
projectConfigQueryService
.
getProjectConfigByProject
(
project
.
getId
()
);
control
=
new
WrapOutControl
();
if
(
ListTools
.
isNotEmpty
(
projectConfigs
)){
ProjectConfig
projectConfig
=
projectConfigs
.
get
(
0
);
control
.
setTaskCreate
(
projectConfig
.
getTaskCreate
());
control
.
setTaskCopy
(
projectConfig
.
getTaskCopy
());
control
.
setTaskRemove
(
projectConfig
.
getTaskRemove
());
control
.
setLaneCreate
(
projectConfig
.
getLaneCreate
());
control
.
setLaneEdit
(
projectConfig
.
getLaneEdit
());
control
.
setLaneRemove
(
projectConfig
.
getLaneRemove
());
control
.
setAttachmentUpload
(
projectConfig
.
getAttachmentUpload
());
control
.
setComment
(
projectConfig
.
getComment
());
}
else
{
control
.
setTaskCreate
(
true
);
}
if
(
business
.
isManager
(
effectivePerson
)
||
effectivePerson
.
getDistinguishedName
().
equalsIgnoreCase
(
project
.
getCreatorPerson
()
)
||
project
.
getManageablePersonList
().
contains
(
effectivePerson
.
getDistinguishedName
()
))
{
control
.
setDelete
(
true
);
control
.
setEdit
(
true
);
control
.
setSortable
(
true
);
control
.
setTaskCreate
(
true
);
}
else
{
control
.
setDelete
(
false
);
control
.
setEdit
(
false
);
...
...
@@ -122,6 +144,9 @@ public class ActionListNextWithFilter extends BaseAction {
}
else
{
control
.
setFounder
(
false
);
}
if
(
project
.
getDeleted
()
||
project
.
getCompleted
()){
control
.
setTaskCreate
(
false
);
}
wo
.
setControl
(
control
);
wos
.
add
(
wo
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录