Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
5c07f5dc
o2oa
项目概览
weixin_42566577
/
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,发现更多精彩内容 >>
提交
5c07f5dc
编写于
3月 24, 2020
作者:
Z
Zhou Rui
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
https://git.o2oa.net/o2oa/o2oa
上级
44aafeb9
12622e8d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
31 addition
and
15 deletion
+31
-15
.gitignore
.gitignore
+1
-1
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java
...e/control/jaxrs/document/ActionPersistPublishContent.java
+23
-9
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAssignCreate.java
...orm/service/processing/jaxrs/work/ActionAssignCreate.java
+4
-1
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionCreate.java
...splatform/service/processing/jaxrs/work/ActionCreate.java
+2
-3
o2web/source/x_component_process_TaskCenter/Main.js
o2web/source/x_component_process_TaskCenter/Main.js
+1
-1
未找到文件。
.gitignore
浏览文件 @
5c07f5dc
...
...
@@ -8,7 +8,7 @@
/o2server/servers/
/o2server/store/jars/*.jar
/o2server/store/*.war
/o2server/
*/
config/
/o2server/config/
/o2server/store/
/o2server/commons/
/o2server/jvm/
...
...
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java
浏览文件 @
5c07f5dc
...
...
@@ -216,10 +216,10 @@ public class ActionPersistPublishContent extends BaseAction {
try
{
JsonElement
docData
=
XGsonBuilder
.
instance
().
toJsonTree
(
wi
.
getDocData
(),
Map
.
class
);
wi
.
setDocStatus
(
"published"
);
if
(
wi
.
getPublishTime
()
==
null
)
{
wi
.
setPublishTime
(
new
Date
()
);
}
document
=
documentPersistService
.
save
(
wi
.
copier
.
copy
(
wi
)
,
docData
);
if
(
wi
.
getPublishTime
()
==
null
)
{
wi
.
setPublishTime
(
new
Date
());
}
document
=
wi
.
copier
.
copy
(
wi
);
document
.
setId
(
wi
.
getId
()
);
document
=
documentPersistService
.
save
(
document
,
docData
);
}
catch
(
Exception
e
)
{
check
=
false
;
Exception
exception
=
new
ExceptionDocumentInfoProcess
(
e
,
"系统在创建文档信息时发生异常!"
);
...
...
@@ -365,10 +365,10 @@ public class ActionPersistPublishContent extends BaseAction {
public
static
class
Wi
{
public
static
List
<
String
>
Excludes
=
new
ArrayList
<
String
>(
JpaObject
.
FieldsUnmodify
);
public
static
WrapCopier
<
Wi
,
Document
>
copier
=
WrapCopierFactory
.
wi
(
Wi
.
class
,
Document
.
class
,
null
,
null
);
private
String
id
=
null
;
@FieldDescribe
(
"文档操作者身份."
)
private
String
identity
=
null
;
...
...
@@ -491,9 +491,23 @@ public class ActionPersistPublishContent extends BaseAction {
private
List
<
String
>
managerList
;
private
List
<
String
>
pictureList
;
public
String
getId
()
{
return
id
;
}
public
void
setId
(
String
id
)
{
this
.
id
=
id
;
}
public
Boolean
getTop
()
{
return
isTop
;
}
public
void
setTop
(
Boolean
top
)
{
isTop
=
top
;
}
public
String
getSummary
()
{
return
summary
;
}
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionAssignCreate.java
浏览文件 @
5c07f5dc
...
...
@@ -55,6 +55,7 @@ import org.apache.commons.lang3.StringUtils;
*
* @author Rui
*
* 此方法不需要推入线程池运行
*/
class
ActionAssignCreate
extends
BaseAction
{
...
...
@@ -66,7 +67,9 @@ class ActionAssignCreate extends BaseAction {
Wo
wo
=
new
Wo
();
Wi
wi
=
this
.
convertToWrapIn
(
jsonElement
,
Wi
.
class
);
Boolean
processing
=
wi
.
getProcessing
();
Work
work
=
null
;
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
Business
business
=
new
Business
(
emc
);
List
<
String
>
applicationIds
=
listApplication
(
business
,
wi
.
getApplication
());
...
...
@@ -125,7 +128,7 @@ class ActionAssignCreate extends BaseAction {
ThisApplication
.
context
().
applications
().
putQuery
(
x_processplatform_service_processing
.
class
,
Applications
.
joinQueryUri
(
"work"
,
work
.
getId
(),
"processing"
),
null
,
work
.
getJob
());
}
wo
.
setId
(
work
.
getId
());
result
.
setData
(
wo
);
return
result
;
...
...
o2server/x_processplatform_service_processing/src/main/java/com/x/processplatform/service/processing/jaxrs/work/ActionCreate.java
浏览文件 @
5c07f5dc
package
com.x.processplatform.service.processing.jaxrs.work
;
import
java.util.Date
;
import
java.util.concurrent.Callable
;
import
com.google.gson.JsonElement
;
import
com.x.base.core.container.EntityManagerContainer
;
import
com.x.base.core.container.factory.EntityManagerContainerFactory
;
import
com.x.base.core.entity.annotation.CheckPersistType
;
import
com.x.base.core.project.executor.ProcessPlatformExecutorFactory
;
import
com.x.base.core.project.http.ActionResult
;
import
com.x.base.core.project.http.EffectivePerson
;
import
com.x.base.core.project.jaxrs.WoId
;
...
...
@@ -26,7 +24,8 @@ import com.x.processplatform.service.processing.WorkDataHelper;
* 创建处于start状态的work
*
* @author Rui
*
*
* 此方法不需要推入线程池运行
*/
class
ActionCreate
extends
BaseAction
{
...
...
o2web/source/x_component_process_TaskCenter/Main.js
浏览文件 @
5c07f5dc
...
...
@@ -1177,7 +1177,7 @@ MWF.xApplication.process.TaskCenter.Starter = new Class({
if
(
pro
.
name
.
indexOf
(
key
)
!==-
1
){
var
data
=
Object
.
clone
(
pro
);
data
.
applicationName
=
app
.
name
;
new
MWF
.
xApplication
.
process
.
TaskCenter
.
Process
(
data
,
{
"
app
"
:
this
},
{
"
name
"
:
app
},
proListNode
);
new
MWF
.
xApplication
.
process
.
TaskCenter
.
Process
(
data
,
{
"
app
"
:
this
.
app
,
"
starter
"
:
this
},
{
"
name
"
:
app
},
proListNode
);
}
}.
bind
(
this
));
}.
bind
(
this
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录