Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
8f83eba0
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,发现更多精彩内容 >>
提交
8f83eba0
编写于
12月 10, 2021
作者:
R
Ray
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixlookup form
上级
91f57e6f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
11 deletion
+24
-11
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java
...emble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java
+4
-3
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java
...surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java
+20
-8
未找到文件。
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompleted.java
浏览文件 @
8f83eba0
...
...
@@ -9,6 +9,7 @@ import java.util.stream.Collectors;
import
java.util.zip.CRC32
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.commons.vfs2.util.DelegatingFileSystemOptionsBuilder
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
...
...
@@ -75,7 +76,7 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
Business
business
=
new
Business
(
emc
);
WorkCompleted
workCompleted
=
null
;
Work
work
=
emc
.
fetch
(
flag
,
Work
.
class
,
ListTools
.
toList
(
JpaObject
.
id_FIELDNAME
,
Work
.
form_FIELDNAME
,
Work
.
activity_FIELDNAME
,
Work
.
activityType_FIELDNAME
));
Work
.
activity_FIELDNAME
,
Work
.
activityType_FIELDNAME
,
Work
.
application_FIELDNAME
));
if
(
null
==
work
)
{
workCompleted
=
emc
.
flag
(
flag
,
WorkCompleted
.
class
);
}
...
...
@@ -101,8 +102,8 @@ class V2LookupWorkOrWorkCompleted extends BaseAction {
}
if
(
null
==
o
)
{
Application
application
=
business
.
application
().
pick
(
work
.
getApplication
());
if
((
null
!=
application
)
&&
StringUtils
.
isNotEmpty
(
application
.
get
Properties
().
get
DefaultForm
()))
{
o
=
business
.
form
().
pick
(
application
.
get
Properties
().
get
DefaultForm
());
if
((
null
!=
application
)
&&
StringUtils
.
isNotEmpty
(
application
.
getDefaultForm
()))
{
o
=
business
.
form
().
pick
(
application
.
getDefaultForm
());
}
}
return
o
;
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/form/V2LookupWorkOrWorkCompletedMobile.java
浏览文件 @
8f83eba0
...
...
@@ -27,6 +27,7 @@ import com.x.processplatform.core.entity.content.Work;
import
com.x.processplatform.core.entity.content.WorkCompleted
;
import
com.x.processplatform.core.entity.content.WorkCompletedProperties.StoreForm
;
import
com.x.processplatform.core.entity.element.Activity
;
import
com.x.processplatform.core.entity.element.Application
;
import
com.x.processplatform.core.entity.element.Form
;
import
com.x.processplatform.core.entity.element.FormProperties
;
...
...
@@ -74,18 +75,12 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
Business
business
=
new
Business
(
emc
);
WorkCompleted
workCompleted
=
null
;
Work
work
=
emc
.
fetch
(
flag
,
Work
.
class
,
ListTools
.
toList
(
JpaObject
.
id_FIELDNAME
,
Work
.
form_FIELDNAME
,
Work
.
activity_FIELDNAME
,
Work
.
activityType_FIELDNAME
));
Work
.
activity_FIELDNAME
,
Work
.
activityType_FIELDNAME
,
Work
.
application_FIELDNAME
));
if
(
null
==
work
)
{
workCompleted
=
emc
.
flag
(
flag
,
WorkCompleted
.
class
);
}
if
(
null
!=
work
)
{
this
.
form
=
business
.
form
().
pick
(
work
.
getForm
());
if
(
null
==
this
.
form
)
{
Activity
activity
=
business
.
getActivity
(
work
);
if
(
null
!=
activity
)
{
this
.
form
=
business
.
form
().
pick
(
activity
.
getForm
());
}
}
this
.
form
=
getFormWithWork
(
business
,
work
);
}
else
if
(
null
!=
workCompleted
)
{
this
.
form
=
business
.
form
().
pick
(
workCompleted
.
getForm
());
if
(
null
==
this
.
form
)
{
...
...
@@ -96,6 +91,23 @@ class V2LookupWorkOrWorkCompletedMobile extends BaseAction {
}
}
private
Form
getFormWithWork
(
Business
business
,
Work
work
)
throws
Exception
{
Form
o
=
business
.
form
().
pick
(
work
.
getForm
());
if
(
null
==
o
)
{
Activity
activity
=
business
.
getActivity
(
work
);
if
(
null
!=
activity
)
{
o
=
business
.
form
().
pick
(
activity
.
getForm
());
}
}
if
(
null
==
o
)
{
Application
application
=
business
.
application
().
pick
(
work
.
getApplication
());
if
((
null
!=
application
)
&&
StringUtils
.
isNotEmpty
(
application
.
getDefaultForm
()))
{
o
=
business
.
form
().
pick
(
application
.
getDefaultForm
());
}
}
return
o
;
}
private
CompletableFuture
<
List
<
String
>>
relatedFormFuture
(
FormProperties
properties
)
{
return
CompletableFuture
.
supplyAsync
(()
->
{
List
<
String
>
list
=
new
ArrayList
<>();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录