Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
浙江兰德纵横网络技术股份有限公司
o2oa
提交
b81d9c6b
o2oa
项目概览
浙江兰德纵横网络技术股份有限公司
/
o2oa
通知
332
Star
10
Fork
6
代码
文件
提交
分支
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 搜索 >>
提交
b81d9c6b
编写于
4月 08, 2024
作者:
O
o2sword
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
根据应用获取可启动的流程排序按照先别名再按名称,与起草获取可启动流程接口返回一致
上级
d0263082
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
16 addition
and
22 deletion
+16
-22
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/process/ActionListWithPersonWithApplication.java
...ce/jaxrs/process/ActionListWithPersonWithApplication.java
+4
-6
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/process/ActionListWithPersonWithApplicationFilter.java
...rs/process/ActionListWithPersonWithApplicationFilter.java
+12
-16
未找到文件。
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/process/ActionListWithPersonWithApplication.java
浏览文件 @
b81d9c6b
package
com.x.processplatform.assemble.surface.jaxrs.process
;
package
com.x.processplatform.assemble.surface.jaxrs.process
;
import
java.util.ArrayList
;
import
java.util.List
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.JpaObject
;
import
com.x.base.core.entity.JpaObject
;
...
@@ -14,13 +11,14 @@ import com.x.base.core.project.http.ActionResult;
...
@@ -14,13 +11,14 @@ import com.x.base.core.project.http.ActionResult;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.Logger
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.tools.SortTools
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.core.entity.element.Application
;
import
com.x.processplatform.core.entity.element.Application
;
import
com.x.processplatform.core.entity.element.Process
;
import
com.x.processplatform.core.entity.element.Process
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
java.util.ArrayList
;
import
java.util.List
;
class
ActionListWithPersonWithApplication
extends
BaseAction
{
class
ActionListWithPersonWithApplication
extends
BaseAction
{
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
ActionListWithPersonWithApplication
.
class
);
private
static
final
Logger
LOGGER
=
LoggerFactory
.
getLogger
(
ActionListWithPersonWithApplication
.
class
);
...
@@ -49,7 +47,7 @@ class ActionListWithPersonWithApplication extends BaseAction {
...
@@ -49,7 +47,7 @@ class ActionListWithPersonWithApplication extends BaseAction {
for
(
String
id
:
ids
)
{
for
(
String
id
:
ids
)
{
wos
.
add
(
Wo
.
copier
.
copy
(
business
.
process
().
pick
(
id
)));
wos
.
add
(
Wo
.
copier
.
copy
(
business
.
process
().
pick
(
id
)));
}
}
SortTools
.
asc
(
wos
,
false
,
"name"
);
wos
=
business
.
process
().
sort
(
wos
);
result
.
setData
(
wos
);
result
.
setData
(
wos
);
return
result
;
return
result
;
}
}
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/process/ActionListWithPersonWithApplicationFilter.java
浏览文件 @
b81d9c6b
package
com.x.processplatform.assemble.surface.jaxrs.process
;
package
com.x.processplatform.assemble.surface.jaxrs.process
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
javax.persistence.EntityManager
;
import
javax.persistence.criteria.CriteriaBuilder
;
import
javax.persistence.criteria.CriteriaQuery
;
import
javax.persistence.criteria.Predicate
;
import
javax.persistence.criteria.Root
;
import
org.apache.commons.lang3.BooleanUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
com.google.gson.JsonElement
;
import
com.google.gson.JsonElement
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
...
@@ -27,14 +14,23 @@ import com.x.base.core.project.logger.Logger;
...
@@ -27,14 +14,23 @@ import com.x.base.core.project.logger.Logger;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.logger.LoggerFactory
;
import
com.x.base.core.project.organization.OrganizationDefinition
;
import
com.x.base.core.project.organization.OrganizationDefinition
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.base.core.project.tools.ListTools
;
import
com.x.base.core.project.tools.SortTools
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.assemble.surface.Business
;
import
com.x.processplatform.core.entity.element.Application
;
import
com.x.processplatform.core.entity.element.Application
;
import
com.x.processplatform.core.entity.element.Process
;
import
com.x.processplatform.core.entity.element.Process
;
import
com.x.processplatform.core.entity.element.Process_
;
import
com.x.processplatform.core.entity.element.Process_
;
import
com.x.processplatform.core.express.service.processing.jaxrs.process.ActionListWithPersonWithApplicationFilterWi
;
import
com.x.processplatform.core.express.service.processing.jaxrs.process.ActionListWithPersonWithApplicationFilterWi
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
io.swagger.v3.oas.annotations.media.Schema
;
import
org.apache.commons.lang3.BooleanUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
javax.persistence.EntityManager
;
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
;
import
java.util.stream.Collectors
;
class
ActionListWithPersonWithApplicationFilter
extends
BaseAction
{
class
ActionListWithPersonWithApplicationFilter
extends
BaseAction
{
...
@@ -65,7 +61,7 @@ class ActionListWithPersonWithApplicationFilter extends BaseAction {
...
@@ -65,7 +61,7 @@ class ActionListWithPersonWithApplicationFilter extends BaseAction {
for
(
String
id
:
ids
)
{
for
(
String
id
:
ids
)
{
wos
.
add
(
Wo
.
copier
.
copy
(
business
.
process
().
pick
(
id
)));
wos
.
add
(
Wo
.
copier
.
copy
(
business
.
process
().
pick
(
id
)));
}
}
SortTools
.
asc
(
wos
,
false
,
"name"
);
wos
=
business
.
process
().
sort
(
wos
);
result
.
setData
(
wos
);
result
.
setData
(
wos
);
return
result
;
return
result
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录