Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
浙江兰德纵横网络技术股份有限公司
o2oa
提交
09be80f8
o2oa
项目概览
浙江兰德纵横网络技术股份有限公司
/
o2oa
通知
339
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,发现更多精彩内容 >>
提交
09be80f8
编写于
2月 03, 2021
作者:
NoSubject
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'feature/批量上传附件允许修改排序号' into 'project/chinamobile-重庆移动'
[流程平台]批量上传附件允许修改排序号 See merge request o2oa/o2oa!2983
上级
9445aca4
7e4ad1ae
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
6 deletion
+13
-6
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionManageBatchUpload.java
...ble/surface/jaxrs/attachment/ActionManageBatchUpload.java
+11
-5
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/AttachmentAction.java
...m/assemble/surface/jaxrs/attachment/AttachmentAction.java
+2
-1
未找到文件。
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/ActionManageBatchUpload.java
浏览文件 @
09be80f8
...
...
@@ -28,7 +28,7 @@ class ActionManageBatchUpload extends BaseAction {
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
ActionManageBatchUpload
.
class
);
ActionResult
<
Wo
>
execute
(
EffectivePerson
effectivePerson
,
String
workIds
,
String
site
,
String
fileName
,
byte
[]
bytes
,
FormDataContentDisposition
disposition
,
String
extraParam
,
String
person
)
throws
Exception
{
FormDataContentDisposition
disposition
,
String
extraParam
,
String
person
,
Integer
order
)
throws
Exception
{
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
ActionResult
<
Wo
>
result
=
new
ActionResult
<>();
Business
business
=
new
Business
(
emc
);
...
...
@@ -62,11 +62,11 @@ class ActionManageBatchUpload extends BaseAction {
Attachment
attachment
=
null
;
Work
work
=
emc
.
find
(
workId
.
trim
(),
Work
.
class
);
if
(
work
!=
null
)
{
attachment
=
this
.
concreteAttachment
(
work
,
person
,
site
);
attachment
=
this
.
concreteAttachment
(
work
,
person
,
site
,
order
);
}
else
{
WorkCompleted
workCompleted
=
emc
.
find
(
workId
,
WorkCompleted
.
class
);
if
(
null
!=
workCompleted
)
{
attachment
=
this
.
concreteAttachment
(
workCompleted
,
person
,
site
);
attachment
=
this
.
concreteAttachment
(
workCompleted
,
person
,
site
,
order
);
}
}
if
(
attachment
!=
null
){
...
...
@@ -91,7 +91,7 @@ class ActionManageBatchUpload extends BaseAction {
}
}
private
Attachment
concreteAttachment
(
Work
work
,
String
person
,
String
site
)
throws
Exception
{
private
Attachment
concreteAttachment
(
Work
work
,
String
person
,
String
site
,
Integer
order
)
throws
Exception
{
Attachment
attachment
=
new
Attachment
();
attachment
.
setCompleted
(
false
);
attachment
.
setPerson
(
person
);
...
...
@@ -106,10 +106,13 @@ class ActionManageBatchUpload extends BaseAction {
attachment
.
setActivityName
(
work
.
getActivityName
());
attachment
.
setActivityToken
(
work
.
getActivityToken
());
attachment
.
setActivityType
(
work
.
getActivityType
());
if
(
order
!=
null
){
attachment
.
setOrderNumber
(
order
);
}
return
attachment
;
}
private
Attachment
concreteAttachment
(
WorkCompleted
workCompleted
,
String
person
,
String
site
)
throws
Exception
{
private
Attachment
concreteAttachment
(
WorkCompleted
workCompleted
,
String
person
,
String
site
,
Integer
order
)
throws
Exception
{
Attachment
attachment
=
new
Attachment
();
attachment
.
setCompleted
(
true
);
attachment
.
setPerson
(
person
);
...
...
@@ -124,6 +127,9 @@ class ActionManageBatchUpload extends BaseAction {
attachment
.
setActivityName
(
workCompleted
.
getActivityName
());
attachment
.
setActivityToken
(
workCompleted
.
getActivity
());
attachment
.
setActivityType
(
ActivityType
.
end
);
if
(
order
!=
null
){
attachment
.
setOrderNumber
(
order
);
}
return
attachment
;
}
...
...
o2server/x_processplatform_assemble_surface/src/main/java/com/x/processplatform/assemble/surface/jaxrs/attachment/AttachmentAction.java
浏览文件 @
09be80f8
...
...
@@ -1090,6 +1090,7 @@ public class AttachmentAction extends StandardJaxrsAction {
@JaxrsParameterDescribe
(
"位置"
)
@FormDataParam
(
"site"
)
String
site
,
@JaxrsParameterDescribe
(
"附件名称"
)
@FormDataParam
(
FILENAME_FIELD
)
String
fileName
,
@JaxrsParameterDescribe
(
"上传到指定用户"
)
@FormDataParam
(
"person"
)
String
person
,
@JaxrsParameterDescribe
(
"附件排序号"
)
@FormDataParam
(
"orderNumber"
)
Integer
orderNumber
,
@JaxrsParameterDescribe
(
"天印扩展字段"
)
@FormDataParam
(
"extraParam"
)
String
extraParam
,
@FormDataParam
(
FILE_FIELD
)
final
byte
[]
bytes
,
@FormDataParam
(
FILE_FIELD
)
final
FormDataContentDisposition
disposition
)
{
...
...
@@ -1097,7 +1098,7 @@ public class AttachmentAction extends StandardJaxrsAction {
EffectivePerson
effectivePerson
=
this
.
effectivePerson
(
request
);
try
{
result
=
new
ActionManageBatchUpload
().
execute
(
effectivePerson
,
workIds
,
site
,
fileName
,
bytes
,
disposition
,
extraParam
,
person
);
extraParam
,
person
,
orderNumber
);
}
catch
(
Exception
e
)
{
logger
.
error
(
e
,
effectivePerson
,
request
,
null
);
result
.
error
(
e
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录