Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
061f4f9f
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,发现更多精彩内容 >>
提交
061f4f9f
编写于
12月 03, 2020
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复根据组织查询人员信息未排序的问题2
上级
3a46650a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
29 deletion
+39
-29
o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/person/ActionListWithUnitSubDirectLikeObject.java
...s/jaxrs/person/ActionListWithUnitSubDirectLikeObject.java
+17
-12
o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/person/ActionListWithUnitSubNestedLikeObject.java
...s/jaxrs/person/ActionListWithUnitSubNestedLikeObject.java
+22
-17
未找到文件。
o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/person/ActionListWithUnitSubDirectLikeObject.java
浏览文件 @
061f4f9f
...
...
@@ -82,17 +82,20 @@ class ActionListWithUnitSubDirectLikeObject extends BaseAction {
private
List
<
Wo
>
list
(
Business
business
,
Wi
wi
,
List
<
Identity
>
identityList
)
throws
Exception
{
List
<
Wo
>
wos
=
new
ArrayList
<>();
String
str
=
StringUtils
.
lowerCase
(
StringTools
.
escapeSqlLikeKey
(
wi
.
getKey
()));
EntityManager
em
=
business
.
entityManagerContainer
().
get
(
Person
.
class
);
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
Person
>
root
=
cq
.
from
(
Person
.
class
);
Predicate
p
=
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
name
)),
"%"
+
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
);
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
unique
)),
"%"
+
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
pinyin
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
pinyinInitial
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
mobile
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
distinguishedName
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
Predicate
p
=
cb
.
conjunction
();
if
(
StringUtils
.
isNotBlank
(
wi
.
getKey
()))
{
String
str
=
StringUtils
.
lowerCase
(
StringTools
.
escapeSqlLikeKey
(
wi
.
getKey
()));
p
=
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
name
)),
"%"
+
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
);
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
unique
)),
"%"
+
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
pinyin
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
pinyinInitial
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
mobile
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
distinguishedName
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
}
Map
<
String
,
Integer
>
map
=
new
HashMap
<>();
if
(
ListTools
.
isNotEmpty
(
identityList
))
{
for
(
Identity
identity
:
identityList
){
...
...
@@ -117,12 +120,14 @@ class ActionListWithUnitSubDirectLikeObject extends BaseAction {
}
private
List
<
Identity
>
people
(
Business
business
,
Wi
wi
)
throws
Exception
{
List
<
Unit
>
os
=
business
.
unit
().
pick
(
wi
.
getUnitList
());
List
<
String
>
unitIds
=
ListTools
.
extractField
(
os
,
Unit
.
id_FIELDNAME
,
String
.
class
,
true
,
true
);
List
<
Identity
>
list
=
new
ArrayList
<>();
if
(
ListTools
.
isNotEmpty
(
unitIds
))
{
list
=
business
.
entityManagerContainer
().
fetchIn
(
Identity
.
class
,
ListTools
.
toList
(
Identity
.
id_FIELDNAME
,
Identity
.
person_FIELDNAME
,
Identity
.
orderNumber_FIELDNAME
),
Identity
.
unit_FIELDNAME
,
unitIds
);
if
(
ListTools
.
isNotEmpty
(
wi
.
getUnitList
()))
{
List
<
Unit
>
os
=
business
.
unit
().
pick
(
wi
.
getUnitList
());
List
<
String
>
unitIds
=
ListTools
.
extractField
(
os
,
Unit
.
id_FIELDNAME
,
String
.
class
,
true
,
true
);
if
(
ListTools
.
isNotEmpty
(
unitIds
))
{
list
=
business
.
entityManagerContainer
().
fetchIn
(
Identity
.
class
,
ListTools
.
toList
(
Identity
.
id_FIELDNAME
,
Identity
.
person_FIELDNAME
,
Identity
.
orderNumber_FIELDNAME
),
Identity
.
unit_FIELDNAME
,
unitIds
);
}
}
/*EntityManager em = business.entityManagerContainer().get(Identity.class);
CriteriaBuilder cb = em.getCriteriaBuilder();
...
...
o2server/x_organization_assemble_express/src/main/java/com/x/organization/assemble/express/jaxrs/person/ActionListWithUnitSubNestedLikeObject.java
浏览文件 @
061f4f9f
...
...
@@ -82,17 +82,20 @@ class ActionListWithUnitSubNestedLikeObject extends BaseAction {
private
List
<
Wo
>
list
(
Business
business
,
Wi
wi
,
List
<
Identity
>
identityList
)
throws
Exception
{
List
<
Wo
>
wos
=
new
ArrayList
<>();
String
str
=
StringUtils
.
lowerCase
(
StringTools
.
escapeSqlLikeKey
(
wi
.
getKey
()));
EntityManager
em
=
business
.
entityManagerContainer
().
get
(
Person
.
class
);
CriteriaBuilder
cb
=
em
.
getCriteriaBuilder
();
CriteriaQuery
<
String
>
cq
=
cb
.
createQuery
(
String
.
class
);
Root
<
Person
>
root
=
cq
.
from
(
Person
.
class
);
Predicate
p
=
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
name
)),
"%"
+
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
);
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
unique
)),
"%"
+
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
pinyin
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
pinyinInitial
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
mobile
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
distinguishedName
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
Predicate
p
=
cb
.
conjunction
();
if
(
StringUtils
.
isNotBlank
(
wi
.
getKey
()))
{
String
str
=
StringUtils
.
lowerCase
(
StringTools
.
escapeSqlLikeKey
(
wi
.
getKey
()));
p
=
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
name
)),
"%"
+
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
);
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
unique
)),
"%"
+
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
pinyin
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
pinyinInitial
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
mobile
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
p
=
cb
.
or
(
p
,
cb
.
like
(
cb
.
lower
(
root
.
get
(
Person_
.
distinguishedName
)),
str
+
"%"
,
StringTools
.
SQL_ESCAPE_CHAR
));
}
Map
<
String
,
Integer
>
map
=
new
HashMap
<>();
if
(
ListTools
.
isNotEmpty
(
identityList
))
{
for
(
Identity
identity
:
identityList
){
...
...
@@ -117,17 +120,19 @@ class ActionListWithUnitSubNestedLikeObject extends BaseAction {
}
private
List
<
Identity
>
people
(
Business
business
,
Wi
wi
)
throws
Exception
{
List
<
Unit
>
os
=
business
.
unit
().
pick
(
wi
.
getUnitList
());
List
<
String
>
unitIds
=
new
ArrayList
<>();
for
(
Unit
o
:
os
)
{
unitIds
.
add
(
o
.
getId
());
unitIds
.
addAll
(
business
.
unit
().
listSubNested
(
o
.
getId
()));
}
unitIds
=
ListTools
.
trim
(
unitIds
,
true
,
true
);
List
<
Identity
>
list
=
new
ArrayList
<>();
if
(
ListTools
.
isNotEmpty
(
unitIds
))
{
list
=
business
.
entityManagerContainer
().
fetchIn
(
Identity
.
class
,
ListTools
.
toList
(
Identity
.
id_FIELDNAME
,
Identity
.
person_FIELDNAME
,
Identity
.
orderNumber_FIELDNAME
),
Identity
.
unit_FIELDNAME
,
unitIds
);
if
(
ListTools
.
isNotEmpty
(
wi
.
getUnitList
()))
{
List
<
Unit
>
os
=
business
.
unit
().
pick
(
wi
.
getUnitList
());
List
<
String
>
unitIds
=
new
ArrayList
<>();
for
(
Unit
o
:
os
)
{
unitIds
.
add
(
o
.
getId
());
unitIds
.
addAll
(
business
.
unit
().
listSubNested
(
o
.
getId
()));
}
unitIds
=
ListTools
.
trim
(
unitIds
,
true
,
true
);
if
(
ListTools
.
isNotEmpty
(
unitIds
))
{
list
=
business
.
entityManagerContainer
().
fetchIn
(
Identity
.
class
,
ListTools
.
toList
(
Identity
.
id_FIELDNAME
,
Identity
.
person_FIELDNAME
,
Identity
.
orderNumber_FIELDNAME
),
Identity
.
unit_FIELDNAME
,
unitIds
);
}
}
/*EntityManager em = business.entityManagerContainer().get(Identity.class);
CriteriaBuilder cb = em.getCriteriaBuilder();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录