Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
594bba2b
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,发现更多精彩内容 >>
提交
594bba2b
编写于
5月 16, 2019
作者:
R
roo00
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
废弃collaboration模块
上级
9c9d1495
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
136 addition
and
128 deletion
+136
-128
o2server/x_attendance_assemble_control/pom.xml
o2server/x_attendance_assemble_control/pom.xml
+0
-4
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceNoticeService.java
...nce/assemble/control/service/AttendanceNoticeService.java
+51
-51
o2server/x_attendance_assemble_control/src/main/webapp/jest/describe.js
...endance_assemble_control/src/main/webapp/jest/describe.js
+17
-5
o2server/x_calendar_assemble_control/pom.xml
o2server/x_calendar_assemble_control/pom.xml
+0
-4
o2server/x_calendar_assemble_control/src/main/webapp/jest/describe.js
...alendar_assemble_control/src/main/webapp/jest/describe.js
+17
-5
o2server/x_cms_assemble_control/pom.xml
o2server/x_cms_assemble_control/pom.xml
+0
-4
o2server/x_file_assemble_control/pom.xml
o2server/x_file_assemble_control/pom.xml
+0
-4
o2server/x_meeting_assemble_control/pom.xml
o2server/x_meeting_assemble_control/pom.xml
+0
-4
o2server/x_mind_assemble_control/pom.xml
o2server/x_mind_assemble_control/pom.xml
+0
-4
o2server/x_mind_assemble_control/src/main/webapp/jest/describe.js
.../x_mind_assemble_control/src/main/webapp/jest/describe.js
+17
-5
o2server/x_okr_assemble_control/pom.xml
o2server/x_okr_assemble_control/pom.xml
+0
-4
o2server/x_processplatform_assemble_bam/pom.xml
o2server/x_processplatform_assemble_bam/pom.xml
+0
-4
o2server/x_processplatform_assemble_bam/src/main/webapp/jest/describe.js
...essplatform_assemble_bam/src/main/webapp/jest/describe.js
+17
-5
o2server/x_processplatform_assemble_designer/pom.xml
o2server/x_processplatform_assemble_designer/pom.xml
+0
-4
o2server/x_processplatform_assemble_designer/src/main/webapp/jest/describe.js
...atform_assemble_designer/src/main/webapp/jest/describe.js
+17
-5
o2server/x_processplatform_assemble_surface/pom.xml
o2server/x_processplatform_assemble_surface/pom.xml
+0
-4
o2server/x_processplatform_service_processing/pom.xml
o2server/x_processplatform_service_processing/pom.xml
+0
-4
o2server/x_query_assemble_designer/pom.xml
o2server/x_query_assemble_designer/pom.xml
+0
-4
o2server/x_query_assemble_surface/pom.xml
o2server/x_query_assemble_surface/pom.xml
+0
-4
未找到文件。
o2server/x_attendance_assemble_control/pom.xml
浏览文件 @
594bba2b
...
...
@@ -20,10 +20,6 @@
<groupId>
o2oa
</groupId>
<artifactId>
x_attendance_core_entity
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_collaboration_core_message
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_organization_core_express
</artifactId>
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/service/AttendanceNoticeService.java
浏览文件 @
594bba2b
package
com.x.attendance.assemble.control.service
;
import
com.x.attendance.entity.AttendanceAppealInfo
;
import
com.x.collaboration.core.message.Collaboration
;
import
com.x.collaboration.core.message.notification.AttendanceAppealAcceptMessage
;
import
com.x.collaboration.core.message.notification.AttendanceAppealInviteMessage
;
import
com.x.collaboration.core.message.notification.AttendanceAppealRejectMessage
;
public
class
AttendanceNoticeService
{
...
...
@@ -17,22 +12,23 @@ public class AttendanceNoticeService {
* @param person
* @throws Exception
*/
public
void
notifyAttendanceAppealAcceptMessage
(
AttendanceAppealInfo
attendanceAppealInfo
,
String
person
)
throws
Exception
{
if
(
attendanceAppealInfo
!=
null
)
{
public
void
notifyAttendanceAppealAcceptMessage
(
AttendanceAppealInfo
attendanceAppealInfo
,
String
person
)
throws
Exception
{
if
(
attendanceAppealInfo
!=
null
)
{
String
targetName
=
attendanceAppealInfo
.
getEmpName
();
String
messageContent
=
"您好,["
+
attendanceAppealInfo
.
getRecordDateString
()
+
"]考勤结果的申诉已经通过审核。"
;
if
(
targetName
!=
null
&&
!
targetName
.
isEmpty
()){
String
[]
array
=
targetName
.
split
(
","
);
for
(
String
name
:
array
){
if
(
name
!=
null
&&
!
name
.
trim
().
isEmpty
()){
AttendanceAppealAcceptMessage
message
=
new
AttendanceAppealAcceptMessage
(
name
,
attendanceAppealInfo
.
getId
(),
attendanceAppealInfo
.
getDetailId
(),
messageContent
);
Collaboration
.
send
(
message
);
if
(
targetName
!=
null
&&
!
targetName
.
isEmpty
())
{
String
[]
array
=
targetName
.
split
(
","
);
for
(
String
name
:
array
)
{
if
(
name
!=
null
&&
!
name
.
trim
().
isEmpty
())
{
// @Todo
// AttendanceAppealAcceptMessage message = new AttendanceAppealAcceptMessage( name, attendanceAppealInfo.getId(), attendanceAppealInfo.getDetailId(), messageContent );
// Collaboration.send(message);
}
}
}
}
else
{
throw
new
Exception
(
"attendanceAppealInfo is null, can not send message!"
);
}
else
{
throw
new
Exception
(
"attendanceAppealInfo is null, can not send message!"
);
}
}
...
...
@@ -44,25 +40,26 @@ public class AttendanceNoticeService {
* @param person
* @throws Exception
*/
public
void
notifyAttendanceAppealRejectMessage
(
AttendanceAppealInfo
attendanceAppealInfo
,
String
person
)
throws
Exception
{
if
(
attendanceAppealInfo
!=
null
)
{
public
void
notifyAttendanceAppealRejectMessage
(
AttendanceAppealInfo
attendanceAppealInfo
,
String
person
)
throws
Exception
{
if
(
attendanceAppealInfo
!=
null
)
{
String
targetName
=
attendanceAppealInfo
.
getEmpName
();
String
messageContent
=
"您好,["
+
attendanceAppealInfo
.
getRecordDateString
()
+
"]考勤结果的申诉未通过审核。"
;
if
(
targetName
!=
null
&&
!
targetName
.
isEmpty
()){
String
[]
array
=
targetName
.
split
(
","
);
for
(
String
name
:
array
){
if
(
name
!=
null
&&
!
name
.
trim
().
isEmpty
()){
AttendanceAppealRejectMessage
message
=
new
AttendanceAppealRejectMessage
(
name
,
attendanceAppealInfo
.
getId
(),
attendanceAppealInfo
.
getDetailId
(),
messageContent
);
Collaboration
.
send
(
message
);
if
(
targetName
!=
null
&&
!
targetName
.
isEmpty
())
{
String
[]
array
=
targetName
.
split
(
","
);
for
(
String
name
:
array
)
{
if
(
name
!=
null
&&
!
name
.
trim
().
isEmpty
())
{
// AttendanceAppealRejectMessage message = new AttendanceAppealRejectMessage(name,
// attendanceAppealInfo.getId(), attendanceAppealInfo.getDetailId(), messageContent);
// Collaboration.send(message);
}
}
}
}
else
{
throw
new
Exception
(
"attendanceAppealInfo is null, can not send message!"
);
}
else
{
throw
new
Exception
(
"attendanceAppealInfo is null, can not send message!"
);
}
}
/**
* 收到一份需要处理的申诉-处理人1
*
...
...
@@ -70,21 +67,23 @@ public class AttendanceNoticeService {
* @param attendanceDetail
* @throws Exception
*/
public
void
notifyAttendanceAppealProcessness1Message
(
AttendanceAppealInfo
attendanceAppealInfo
)
throws
Exception
{
if
(
attendanceAppealInfo
!=
null
)
{
public
void
notifyAttendanceAppealProcessness1Message
(
AttendanceAppealInfo
attendanceAppealInfo
)
throws
Exception
{
if
(
attendanceAppealInfo
!=
null
)
{
String
targetName
=
attendanceAppealInfo
.
getCurrentProcessor
();
String
messageContent
=
"您收到了"
+
attendanceAppealInfo
.
getEmpName
()
+
"的考勤结果申诉,申诉类型为["
+
attendanceAppealInfo
.
getAppealReason
()
+
"],请您审核!"
;
if
(
targetName
!=
null
&&
!
targetName
.
isEmpty
()){
String
[]
array
=
targetName
.
split
(
","
);
for
(
String
name
:
array
){
if
(
name
!=
null
&&
!
name
.
trim
().
isEmpty
()){
AttendanceAppealInviteMessage
message
=
new
AttendanceAppealInviteMessage
(
name
,
attendanceAppealInfo
.
getId
(),
attendanceAppealInfo
.
getDetailId
(),
messageContent
);
Collaboration
.
send
(
message
);
String
messageContent
=
"您收到了"
+
attendanceAppealInfo
.
getEmpName
()
+
"的考勤结果申诉,申诉类型为["
+
attendanceAppealInfo
.
getAppealReason
()
+
"],请您审核!"
;
if
(
targetName
!=
null
&&
!
targetName
.
isEmpty
())
{
String
[]
array
=
targetName
.
split
(
","
);
for
(
String
name
:
array
)
{
if
(
name
!=
null
&&
!
name
.
trim
().
isEmpty
())
{
// AttendanceAppealInviteMessage message = new AttendanceAppealInviteMessage(name,
// attendanceAppealInfo.getId(), attendanceAppealInfo.getDetailId(), messageContent);
// Collaboration.send(message);
}
}
}
}
else
{
throw
new
Exception
(
"attendanceAppealInfo is null, can not send message!"
);
}
else
{
throw
new
Exception
(
"attendanceAppealInfo is null, can not send message!"
);
}
}
...
...
@@ -95,22 +94,23 @@ public class AttendanceNoticeService {
* @param attendanceDetail
* @throws Exception
*/
public
void
notifyAttendanceAppealProcessness2Message
(
AttendanceAppealInfo
attendanceAppealInfo
)
throws
Exception
{
if
(
attendanceAppealInfo
!=
null
){
public
void
notifyAttendanceAppealProcessness2Message
(
AttendanceAppealInfo
attendanceAppealInfo
)
throws
Exception
{
if
(
attendanceAppealInfo
!=
null
)
{
String
targetName
=
attendanceAppealInfo
.
getCurrentProcessor
();
String
messageContent
=
"您收到了"
+
attendanceAppealInfo
.
getEmpName
()
+
"的考勤结果申诉,申诉类型为["
+
attendanceAppealInfo
.
getAppealReason
()
+
"],请您复核!"
;
if
(
targetName
!=
null
&&
!
targetName
.
isEmpty
()){
String
[]
array
=
targetName
.
split
(
","
);
for
(
String
name
:
array
){
if
(
name
!=
null
&&
!
name
.
trim
().
isEmpty
()){
AttendanceAppealInviteMessage
message
=
new
AttendanceAppealInviteMessage
(
name
,
attendanceAppealInfo
.
getId
(),
attendanceAppealInfo
.
getDetailId
(),
messageContent
);
Collaboration
.
send
(
message
);
String
messageContent
=
"您收到了"
+
attendanceAppealInfo
.
getEmpName
()
+
"的考勤结果申诉,申诉类型为["
+
attendanceAppealInfo
.
getAppealReason
()
+
"],请您复核!"
;
if
(
targetName
!=
null
&&
!
targetName
.
isEmpty
())
{
String
[]
array
=
targetName
.
split
(
","
);
for
(
String
name
:
array
)
{
if
(
name
!=
null
&&
!
name
.
trim
().
isEmpty
())
{
// AttendanceAppealInviteMessage message = new AttendanceAppealInviteMessage(name,
// attendanceAppealInfo.getId(), attendanceAppealInfo.getDetailId(), messageContent);
// Collaboration.send(message);
}
}
}
}
else
{
throw
new
Exception
(
"attendanceAppealInfo is null, can not send message!"
);
}
else
{
throw
new
Exception
(
"attendanceAppealInfo is null, can not send message!"
);
}
}
}
o2server/x_attendance_assemble_control/src/main/webapp/jest/describe.js
浏览文件 @
594bba2b
var
Describe
=
function
()
{
//
20180730
//
20180730
}
Describe
.
splitValue
=
function
(
str
)
{
...
...
@@ -38,7 +38,7 @@ Describe.doPost = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
}).
always
(
function
(
resultJson
)
{
$
(
'
#result
'
).
html
(
JSON
.
stringify
(
resultJson
,
null
,
4
));
Describe
.
writeOut
(
m
.
outs
,
resultJson
);
...
...
@@ -55,7 +55,7 @@ Describe.doPost = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
});
}
}
...
...
@@ -74,7 +74,7 @@ Describe.doPut = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
}).
always
(
function
(
resultJson
)
{
$
(
'
#result
'
).
html
(
JSON
.
stringify
(
resultJson
,
null
,
4
));
Describe
.
writeOut
(
m
.
outs
,
resultJson
);
...
...
@@ -91,7 +91,7 @@ Describe.doPut = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
});
}
}
...
...
@@ -269,6 +269,14 @@ Describe.prototype = {
txt
+=
'
</table>
'
;
txt
+=
'
</fieldset>
'
;
}
if
(
m
.
useStringParameter
)
{
txt
+=
'
<fieldset><legend>String</legend>
'
;
txt
+=
'
<table><tr><td>
'
;
txt
+=
'
<textarea id="string" style="height:300px; width:600px; padding:1px; border:1px #000000 solid"/>
'
;
txt
+=
'
</td><td>string</td></tr>
'
;
txt
+=
'
</table>
'
;
txt
+=
'
</fieldset>
'
;
}
if
(
m
.
outs
&&
m
.
outs
.
length
>
0
)
{
txt
+=
'
<fieldset id="outs"><legend>Out</legend>
'
;
txt
+=
'
<table>
'
;
...
...
@@ -318,6 +326,8 @@ Describe.prototype = {
});
}
else
if
(
m
.
useJsonElementParameter
)
{
data
=
$
.
parseJSON
(
$
(
'
#jsonElement
'
).
val
());
}
else
if
(
m
.
useStringParameter
)
{
data
=
$
(
'
#string
'
).
val
();
}
Describe
.
doPost
(
address
,
m
,
data
);
break
;
...
...
@@ -340,6 +350,8 @@ Describe.prototype = {
});
}
else
if
(
m
.
useJsonElementParameter
)
{
data
=
$
.
parseJSON
(
$
(
'
#jsonElement
'
).
val
());
}
else
if
(
m
.
useStringParameter
)
{
data
=
$
(
'
#string
'
).
val
();
}
Describe
.
doPut
(
address
,
m
,
data
);
break
;
...
...
o2server/x_calendar_assemble_control/pom.xml
浏览文件 @
594bba2b
...
...
@@ -24,10 +24,6 @@
<groupId>
o2oa
</groupId>
<artifactId>
x_organization_core_express
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_collaboration_core_message
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_calendar_core_entity
</artifactId>
...
...
o2server/x_calendar_assemble_control/src/main/webapp/jest/describe.js
浏览文件 @
594bba2b
var
Describe
=
function
()
{
//
20180730
//
20180730
}
Describe
.
splitValue
=
function
(
str
)
{
...
...
@@ -38,7 +38,7 @@ Describe.doPost = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
}).
always
(
function
(
resultJson
)
{
$
(
'
#result
'
).
html
(
JSON
.
stringify
(
resultJson
,
null
,
4
));
Describe
.
writeOut
(
m
.
outs
,
resultJson
);
...
...
@@ -55,7 +55,7 @@ Describe.doPost = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
});
}
}
...
...
@@ -74,7 +74,7 @@ Describe.doPut = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
}).
always
(
function
(
resultJson
)
{
$
(
'
#result
'
).
html
(
JSON
.
stringify
(
resultJson
,
null
,
4
));
Describe
.
writeOut
(
m
.
outs
,
resultJson
);
...
...
@@ -91,7 +91,7 @@ Describe.doPut = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
});
}
}
...
...
@@ -269,6 +269,14 @@ Describe.prototype = {
txt
+=
'
</table>
'
;
txt
+=
'
</fieldset>
'
;
}
if
(
m
.
useStringParameter
)
{
txt
+=
'
<fieldset><legend>String</legend>
'
;
txt
+=
'
<table><tr><td>
'
;
txt
+=
'
<textarea id="string" style="height:300px; width:600px; padding:1px; border:1px #000000 solid"/>
'
;
txt
+=
'
</td><td>string</td></tr>
'
;
txt
+=
'
</table>
'
;
txt
+=
'
</fieldset>
'
;
}
if
(
m
.
outs
&&
m
.
outs
.
length
>
0
)
{
txt
+=
'
<fieldset id="outs"><legend>Out</legend>
'
;
txt
+=
'
<table>
'
;
...
...
@@ -318,6 +326,8 @@ Describe.prototype = {
});
}
else
if
(
m
.
useJsonElementParameter
)
{
data
=
$
.
parseJSON
(
$
(
'
#jsonElement
'
).
val
());
}
else
if
(
m
.
useStringParameter
)
{
data
=
$
(
'
#string
'
).
val
();
}
Describe
.
doPost
(
address
,
m
,
data
);
break
;
...
...
@@ -340,6 +350,8 @@ Describe.prototype = {
});
}
else
if
(
m
.
useJsonElementParameter
)
{
data
=
$
.
parseJSON
(
$
(
'
#jsonElement
'
).
val
());
}
else
if
(
m
.
useStringParameter
)
{
data
=
$
(
'
#string
'
).
val
();
}
Describe
.
doPut
(
address
,
m
,
data
);
break
;
...
...
o2server/x_cms_assemble_control/pom.xml
浏览文件 @
594bba2b
...
...
@@ -24,10 +24,6 @@
<groupId>
o2oa
</groupId>
<artifactId>
x_organization_core_express
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_collaboration_core_message
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_cms_core_entity
</artifactId>
...
...
o2server/x_file_assemble_control/pom.xml
浏览文件 @
594bba2b
...
...
@@ -24,10 +24,6 @@
<groupId>
o2oa
</groupId>
<artifactId>
x_organization_core_express
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_collaboration_core_message
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_file_core_entity
</artifactId>
...
...
o2server/x_meeting_assemble_control/pom.xml
浏览文件 @
594bba2b
...
...
@@ -28,10 +28,6 @@
<groupId>
o2oa
</groupId>
<artifactId>
x_meeting_core_entity
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_collaboration_core_message
</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
...
...
o2server/x_mind_assemble_control/pom.xml
浏览文件 @
594bba2b
...
...
@@ -24,10 +24,6 @@
<groupId>
o2oa
</groupId>
<artifactId>
x_mind_core_entity
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_collaboration_core_message
</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
...
...
o2server/x_mind_assemble_control/src/main/webapp/jest/describe.js
浏览文件 @
594bba2b
var
Describe
=
function
()
{
//
20180730
//
20180730
}
Describe
.
splitValue
=
function
(
str
)
{
...
...
@@ -38,7 +38,7 @@ Describe.doPost = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
}).
always
(
function
(
resultJson
)
{
$
(
'
#result
'
).
html
(
JSON
.
stringify
(
resultJson
,
null
,
4
));
Describe
.
writeOut
(
m
.
outs
,
resultJson
);
...
...
@@ -55,7 +55,7 @@ Describe.doPost = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
});
}
}
...
...
@@ -74,7 +74,7 @@ Describe.doPut = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
}).
always
(
function
(
resultJson
)
{
$
(
'
#result
'
).
html
(
JSON
.
stringify
(
resultJson
,
null
,
4
));
Describe
.
writeOut
(
m
.
outs
,
resultJson
);
...
...
@@ -91,7 +91,7 @@ Describe.doPut = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
});
}
}
...
...
@@ -269,6 +269,14 @@ Describe.prototype = {
txt
+=
'
</table>
'
;
txt
+=
'
</fieldset>
'
;
}
if
(
m
.
useStringParameter
)
{
txt
+=
'
<fieldset><legend>String</legend>
'
;
txt
+=
'
<table><tr><td>
'
;
txt
+=
'
<textarea id="string" style="height:300px; width:600px; padding:1px; border:1px #000000 solid"/>
'
;
txt
+=
'
</td><td>string</td></tr>
'
;
txt
+=
'
</table>
'
;
txt
+=
'
</fieldset>
'
;
}
if
(
m
.
outs
&&
m
.
outs
.
length
>
0
)
{
txt
+=
'
<fieldset id="outs"><legend>Out</legend>
'
;
txt
+=
'
<table>
'
;
...
...
@@ -318,6 +326,8 @@ Describe.prototype = {
});
}
else
if
(
m
.
useJsonElementParameter
)
{
data
=
$
.
parseJSON
(
$
(
'
#jsonElement
'
).
val
());
}
else
if
(
m
.
useStringParameter
)
{
data
=
$
(
'
#string
'
).
val
();
}
Describe
.
doPost
(
address
,
m
,
data
);
break
;
...
...
@@ -340,6 +350,8 @@ Describe.prototype = {
});
}
else
if
(
m
.
useJsonElementParameter
)
{
data
=
$
.
parseJSON
(
$
(
'
#jsonElement
'
).
val
());
}
else
if
(
m
.
useStringParameter
)
{
data
=
$
(
'
#string
'
).
val
();
}
Describe
.
doPut
(
address
,
m
,
data
);
break
;
...
...
o2server/x_okr_assemble_control/pom.xml
浏览文件 @
594bba2b
...
...
@@ -24,10 +24,6 @@
<groupId>
o2oa
</groupId>
<artifactId>
x_okr_core_entity
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_collaboration_core_message
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_processplatform_core_entity
</artifactId>
...
...
o2server/x_processplatform_assemble_bam/pom.xml
浏览文件 @
594bba2b
...
...
@@ -32,10 +32,6 @@
<groupId>
o2oa
</groupId>
<artifactId>
x_processplatform_core_entity
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_collaboration_core_message
</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
...
...
o2server/x_processplatform_assemble_bam/src/main/webapp/jest/describe.js
浏览文件 @
594bba2b
var
Describe
=
function
()
{
//
20180730
//
20180730
}
Describe
.
splitValue
=
function
(
str
)
{
...
...
@@ -38,7 +38,7 @@ Describe.doPost = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
}).
always
(
function
(
resultJson
)
{
$
(
'
#result
'
).
html
(
JSON
.
stringify
(
resultJson
,
null
,
4
));
Describe
.
writeOut
(
m
.
outs
,
resultJson
);
...
...
@@ -55,7 +55,7 @@ Describe.doPost = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
});
}
}
...
...
@@ -74,7 +74,7 @@ Describe.doPut = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
}).
always
(
function
(
resultJson
)
{
$
(
'
#result
'
).
html
(
JSON
.
stringify
(
resultJson
,
null
,
4
));
Describe
.
writeOut
(
m
.
outs
,
resultJson
);
...
...
@@ -91,7 +91,7 @@ Describe.doPut = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
});
}
}
...
...
@@ -269,6 +269,14 @@ Describe.prototype = {
txt
+=
'
</table>
'
;
txt
+=
'
</fieldset>
'
;
}
if
(
m
.
useStringParameter
)
{
txt
+=
'
<fieldset><legend>String</legend>
'
;
txt
+=
'
<table><tr><td>
'
;
txt
+=
'
<textarea id="string" style="height:300px; width:600px; padding:1px; border:1px #000000 solid"/>
'
;
txt
+=
'
</td><td>string</td></tr>
'
;
txt
+=
'
</table>
'
;
txt
+=
'
</fieldset>
'
;
}
if
(
m
.
outs
&&
m
.
outs
.
length
>
0
)
{
txt
+=
'
<fieldset id="outs"><legend>Out</legend>
'
;
txt
+=
'
<table>
'
;
...
...
@@ -318,6 +326,8 @@ Describe.prototype = {
});
}
else
if
(
m
.
useJsonElementParameter
)
{
data
=
$
.
parseJSON
(
$
(
'
#jsonElement
'
).
val
());
}
else
if
(
m
.
useStringParameter
)
{
data
=
$
(
'
#string
'
).
val
();
}
Describe
.
doPost
(
address
,
m
,
data
);
break
;
...
...
@@ -340,6 +350,8 @@ Describe.prototype = {
});
}
else
if
(
m
.
useJsonElementParameter
)
{
data
=
$
.
parseJSON
(
$
(
'
#jsonElement
'
).
val
());
}
else
if
(
m
.
useStringParameter
)
{
data
=
$
(
'
#string
'
).
val
();
}
Describe
.
doPut
(
address
,
m
,
data
);
break
;
...
...
o2server/x_processplatform_assemble_designer/pom.xml
浏览文件 @
594bba2b
...
...
@@ -32,10 +32,6 @@
<groupId>
o2oa
</groupId>
<artifactId>
x_processplatform_core_entity
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_collaboration_core_message
</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
...
...
o2server/x_processplatform_assemble_designer/src/main/webapp/jest/describe.js
浏览文件 @
594bba2b
var
Describe
=
function
()
{
//
20180730
//
20180730
}
Describe
.
splitValue
=
function
(
str
)
{
...
...
@@ -38,7 +38,7 @@ Describe.doPost = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
}).
always
(
function
(
resultJson
)
{
$
(
'
#result
'
).
html
(
JSON
.
stringify
(
resultJson
,
null
,
4
));
Describe
.
writeOut
(
m
.
outs
,
resultJson
);
...
...
@@ -55,7 +55,7 @@ Describe.doPost = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
});
}
}
...
...
@@ -74,7 +74,7 @@ Describe.doPut = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
}).
always
(
function
(
resultJson
)
{
$
(
'
#result
'
).
html
(
JSON
.
stringify
(
resultJson
,
null
,
4
));
Describe
.
writeOut
(
m
.
outs
,
resultJson
);
...
...
@@ -91,7 +91,7 @@ Describe.doPut = function(address, m, data) {
xhrFields
:
{
'
withCredentials
'
:
true
},
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
?
JSON
.
stringify
(
data
)
:
data
)
data
:
((
m
.
contentType
.
indexOf
(
'
application/json
'
)
>
-
1
)
&&
(
!
m
.
useStringParameter
)
?
JSON
.
stringify
(
data
)
:
data
)
});
}
}
...
...
@@ -269,6 +269,14 @@ Describe.prototype = {
txt
+=
'
</table>
'
;
txt
+=
'
</fieldset>
'
;
}
if
(
m
.
useStringParameter
)
{
txt
+=
'
<fieldset><legend>String</legend>
'
;
txt
+=
'
<table><tr><td>
'
;
txt
+=
'
<textarea id="string" style="height:300px; width:600px; padding:1px; border:1px #000000 solid"/>
'
;
txt
+=
'
</td><td>string</td></tr>
'
;
txt
+=
'
</table>
'
;
txt
+=
'
</fieldset>
'
;
}
if
(
m
.
outs
&&
m
.
outs
.
length
>
0
)
{
txt
+=
'
<fieldset id="outs"><legend>Out</legend>
'
;
txt
+=
'
<table>
'
;
...
...
@@ -318,6 +326,8 @@ Describe.prototype = {
});
}
else
if
(
m
.
useJsonElementParameter
)
{
data
=
$
.
parseJSON
(
$
(
'
#jsonElement
'
).
val
());
}
else
if
(
m
.
useStringParameter
)
{
data
=
$
(
'
#string
'
).
val
();
}
Describe
.
doPost
(
address
,
m
,
data
);
break
;
...
...
@@ -340,6 +350,8 @@ Describe.prototype = {
});
}
else
if
(
m
.
useJsonElementParameter
)
{
data
=
$
.
parseJSON
(
$
(
'
#jsonElement
'
).
val
());
}
else
if
(
m
.
useStringParameter
)
{
data
=
$
(
'
#string
'
).
val
();
}
Describe
.
doPut
(
address
,
m
,
data
);
break
;
...
...
o2server/x_processplatform_assemble_surface/pom.xml
浏览文件 @
594bba2b
...
...
@@ -32,10 +32,6 @@
<groupId>
o2oa
</groupId>
<artifactId>
x_processplatform_core_entity
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_collaboration_core_message
</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
...
...
o2server/x_processplatform_service_processing/pom.xml
浏览文件 @
594bba2b
...
...
@@ -32,10 +32,6 @@
<groupId>
o2oa
</groupId>
<artifactId>
x_processplatform_core_entity
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_collaboration_core_message
</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
...
...
o2server/x_query_assemble_designer/pom.xml
浏览文件 @
594bba2b
...
...
@@ -36,10 +36,6 @@
<groupId>
o2oa
</groupId>
<artifactId>
x_processplatform_core_entity
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_collaboration_core_message
</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
...
...
o2server/x_query_assemble_surface/pom.xml
浏览文件 @
594bba2b
...
...
@@ -36,10 +36,6 @@
<groupId>
o2oa
</groupId>
<artifactId>
x_processplatform_core_entity
</artifactId>
</dependency>
<dependency>
<groupId>
o2oa
</groupId>
<artifactId>
x_collaboration_core_message
</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录