Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
5cef7386
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
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,发现更多精彩内容 >>
提交
5cef7386
编写于
12月 01, 2020
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
review的管理员查询接口增加job参数查询
上级
24c61995
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
10 deletion
+49
-10
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/review/V2Base.java
...processplatform/assemble/surface/jaxrs/review/V2Base.java
+3
-8
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/review/V2ManageListPaging.java
...orm/assemble/surface/jaxrs/review/V2ManageListPaging.java
+46
-2
未找到文件。
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/review/V2Base.java
浏览文件 @
5cef7386
...
...
@@ -436,21 +436,16 @@ abstract class V2Base extends StandardJaxrsAction {
}
protected
Predicate
toFilterPredicate
(
EffectivePerson
effectivePerson
,
Business
business
,
FilterWi
wi
,
List
<
String
>
personList
)
protected
Predicate
toFilterPredicate
(
EffectivePerson
effectivePerson
,
Business
business
,
FilterWi
wi
,
Boolean
isManagerFilter
)
throws
Exception
{
EntityManager
em
=
business
.
entityManagerContainer
().
get
(
Review
.
class
);
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
Tuple
>
cq
=
cb
.
createQuery
(
Tuple
.
class
);
Root
<
Review
>
root
=
cq
.
from
(
Review
.
class
);
Predicate
p
=
cb
.
conjunction
();
if
(
business
.
canManageApplication
(
effectivePerson
,
null
)
&&
ListTools
.
isNotEmpty
(
personList
)){
List
<
String
>
person_ids
=
business
.
organization
().
person
().
list
(
personList
);
p
=
cb
.
and
(
p
,
root
.
get
(
Review_
.
person
).
in
(
person_ids
));
}
else
{
if
(!
BooleanUtils
.
isTrue
(
isManagerFilter
)){
p
=
cb
.
equal
(
root
.
get
(
Review_
.
person
),
effectivePerson
.
getDistinguishedName
());
}
if
(
StringUtils
.
isNotBlank
(
wi
.
getStringValue01
())){
p
=
cb
.
and
(
p
,
cb
.
equal
(
root
.
get
(
Review_
.
stringValue01
),
wi
.
getStringValue01
()));
}
...
...
@@ -598,4 +593,4 @@ abstract class V2Base extends StandardJaxrsAction {
}
}
}
\ No newline at end of file
}
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/review/V2ManageListPaging.java
浏览文件 @
5cef7386
...
...
@@ -9,10 +9,18 @@ import com.x.base.core.project.bean.WrapCopier;
import
com.x.base.core.project.bean.WrapCopierFactory
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.core.entity.content.Review
;
import
com.x.processplatform.core.entity.content.Review_
;
import
javax.persistence.EntityManager
;
import
javax.persistence.Tuple
;
import
javax.persistence.criteria.CriteriaBuilder
;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.Predicate
;
import
javax.persistence.criteria.Root
;
import
java.util.ArrayList
;
import
java.util.List
;
class
V2ManageListPaging
extends
V2Base
{
...
...
@@ -23,7 +31,21 @@ class V2ManageListPaging extends V2Base {
Business
business
=
new
Business
(
emc
);
ActionResult
<
List
<
Wo
>>
result
=
new
ActionResult
<>();
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
Predicate
p
=
this
.
toFilterPredicate
(
effectivePerson
,
business
,
wi
,
wi
.
getPersonList
());
EntityManager
em
=
emc
.
get
(
Review
.
class
);
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
Tuple
>
cq
=
cb
.
createQuery
(
Tuple
.
class
);
Root
<
Review
>
root
=
cq
.
from
(
Review
.
class
);
Predicate
p
=
this
.
toFilterPredicate
(
effectivePerson
,
business
,
wi
,
true
);
if
(
ListTools
.
isNotEmpty
(
wi
.
getPersonList
()))
{
List
<
String
>
person_ids
=
business
.
organization
().
person
().
list
(
wi
.
getPersonList
());
p
=
cb
.
and
(
p
,
root
.
get
(
Review_
.
person
).
in
(
person_ids
));
}
if
(
ListTools
.
isNotEmpty
(
wi
.
getJobList
()))
{
p
=
cb
.
and
(
p
,
root
.
get
(
Review_
.
job
).
in
(
wi
.
getJobList
()));
}
if
(
ListTools
.
isNotEmpty
(
wi
.
getIdList
()))
{
p
=
cb
.
and
(
p
,
root
.
get
(
Review_
.
id
).
in
(
wi
.
getIdList
()));
}
List
<
Wo
>
wos
=
emc
.
fetchDescPaging
(
Review
.
class
,
Wo
.
copier
,
p
,
page
,
size
,
Review
.
sequence_FIELDNAME
);
result
.
setData
(
wos
);
result
.
setCount
(
emc
.
count
(
Review
.
class
,
p
));
...
...
@@ -35,7 +57,29 @@ class V2ManageListPaging extends V2Base {
public
static
class
Wi
extends
RelateFilterWi
{
@FieldDescribe
(
"参阅用户"
)
private
List
<
String
>
personList
;
private
List
<
String
>
personList
=
new
ArrayList
<>();
@FieldDescribe
(
"job标识"
)
private
List
<
String
>
jobList
=
new
ArrayList
<>();
@FieldDescribe
(
"标识"
)
private
List
<
String
>
idList
=
new
ArrayList
<>();
public
List
<
String
>
getJobList
()
{
return
jobList
;
}
public
void
setJobList
(
List
<
String
>
jobList
)
{
this
.
jobList
=
jobList
;
}
public
List
<
String
>
getIdList
()
{
return
idList
;
}
public
void
setIdList
(
List
<
String
>
idList
)
{
this
.
idList
=
idList
;
}
public
List
<
String
>
getPersonList
()
{
return
personList
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录