Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
f6982d98
o2oa
项目概览
fuyue82
/
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,发现更多精彩内容 >>
提交
f6982d98
编写于
1月 25, 2022
作者:
O
o2null
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'cherry-pick-ae83b566' into 'develop'
添加listPaging搜索 See merge request o2oa/o2oa!64
上级
48debc93
cc42fbb6
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
37 addition
and
6 deletion
+37
-6
o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/jaxrs/meeting/ActionPaging.java
.../meeting/assemble/control/jaxrs/meeting/ActionPaging.java
+7
-3
o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/jaxrs/meeting/ActionPagingManage.java
...ng/assemble/control/jaxrs/meeting/ActionPagingManage.java
+9
-3
o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/jaxrs/meeting/BaseAction.java
.../x/meeting/assemble/control/jaxrs/meeting/BaseAction.java
+21
-0
未找到文件。
o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/jaxrs/meeting/ActionPaging.java
浏览文件 @
f6982d98
...
...
@@ -79,6 +79,12 @@ class ActionPaging extends BaseAction {
p
=
filterManualCompleted
(
cb
,
root
,
p
,
wi
.
getManualCompleted
());
p
=
filterHostUnit
(
cb
,
root
,
p
,
wi
.
getHostUnit
());
p
=
filterHostPerson
(
cb
,
root
,
p
,
wi
.
getHostPerson
());
p
=
filterType
(
cb
,
root
,
p
,
wi
.
getType
());
Order
order
;
String
sortField
=
wi
.
getSortField
();
String
sortType
=
wi
.
getSortType
();
...
...
@@ -123,8 +129,6 @@ class ActionPaging extends BaseAction {
}
}
public
static
class
Wo
extends
WrapOutMeeting
{
private
static
final
long
serialVersionUID
=
4609263020989488356L
;
static
final
WrapCopier
<
Meeting
,
Wo
>
copier
=
WrapCopierFactory
.
wo
(
Meeting
.
class
,
Wo
.
class
,
null
,
...
...
@@ -175,7 +179,7 @@ class ActionPaging extends BaseAction {
@FieldDescribe
(
"承办部门"
)
private
String
hostUnit
;
@FieldDescribe
(
"
承办
人"
)
@FieldDescribe
(
"
主持
人"
)
private
String
hostPerson
;
@FieldDescribe
(
"类型"
)
...
...
o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/jaxrs/meeting/ActionPagingManage.java
浏览文件 @
f6982d98
...
...
@@ -105,6 +105,12 @@ class ActionPagingManage extends BaseAction {
p
=
filterManualCompleted
(
cb
,
root
,
p
,
wi
.
getManualCompleted
());
p
=
filterHostUnit
(
cb
,
root
,
p
,
wi
.
getHostUnit
());
p
=
filterHostPerson
(
cb
,
root
,
p
,
wi
.
getHostPerson
());
p
=
filterType
(
cb
,
root
,
p
,
wi
.
getType
());
Order
order
;
String
sortField
=
wi
.
getSortField
();
String
sortType
=
wi
.
getSortType
();
...
...
@@ -128,7 +134,7 @@ class ActionPagingManage extends BaseAction {
typedQuery
.
setFirstResult
(
pageIndex
);
typedQuery
.
setMaxResults
(
pageSize
);
ids
=
typedQuery
.
getResultList
();
LOGGER
.
info
(
"pagingtypedQuery {}."
,
typedQuery:
:
toString
);
LOGGER
.
info
(
"pagingtypedQuery {}."
,
typedQuery:
:
toString
);
TypedQuery
<
String
>
tqCount
=
em
.
createQuery
(
cq
.
select
(
root
.
get
(
Meeting_
.
id
)).
where
(
p
).
distinct
(
true
));
List
<
String
>
allid
=
tqCount
.
getResultList
();
...
...
@@ -202,7 +208,7 @@ class ActionPagingManage extends BaseAction {
@FieldDescribe
(
"承办部门"
)
private
String
hostUnit
;
@FieldDescribe
(
"
承办
人"
)
@FieldDescribe
(
"
主持
人"
)
private
String
hostPerson
;
@FieldDescribe
(
"类型"
)
...
...
o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/jaxrs/meeting/BaseAction.java
浏览文件 @
f6982d98
...
...
@@ -202,4 +202,25 @@ abstract class BaseAction extends StandardJaxrsAction {
return
p
;
}
protected
Predicate
filterHostUnit
(
CriteriaBuilder
cb
,
Root
<
Meeting
>
root
,
Predicate
p
,
String
hostUnit
)
{
if
(!
StringUtils
.
isBlank
(
hostUnit
))
{
p
=
cb
.
and
(
p
,
cb
.
like
(
root
.
get
(
Meeting_
.
hostUnit
),
"%"
+
hostUnit
+
"%"
));
}
return
p
;
}
protected
Predicate
filterHostPerson
(
CriteriaBuilder
cb
,
Root
<
Meeting
>
root
,
Predicate
p
,
String
hostPerson
)
{
if
(!
StringUtils
.
isBlank
(
hostPerson
))
{
p
=
cb
.
and
(
p
,
cb
.
like
(
root
.
get
(
Meeting_
.
hostPerson
),
"%"
+
hostPerson
+
"%"
));
}
return
p
;
}
protected
Predicate
filterType
(
CriteriaBuilder
cb
,
Root
<
Meeting
>
root
,
Predicate
p
,
String
type
)
{
if
(!
StringUtils
.
isBlank
(
type
))
{
p
=
cb
.
and
(
p
,
cb
.
like
(
root
.
get
(
Meeting_
.
type
),
"%"
+
type
+
"%"
));
}
return
p
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录