Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
f4ad7ad1
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,发现更多精彩内容 >>
提交
f4ad7ad1
编写于
7月 21, 2020
作者:
liyi_hz2008
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[内容管理]删除了多余的代码
[考勤管理]修复了SignType无法过滤查询内容的问题
上级
98ca33f0
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
20 addition
and
46 deletion
+20
-46
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceDetailFactory.java
...nce/assemble/control/factory/AttendanceDetailFactory.java
+4
-4
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java
...e/control/jaxrs/document/ActionPersistPublishContent.java
+12
-12
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/queue/QueueSendDocumentNotify.java
...x/cms/assemble/control/queue/QueueSendDocumentNotify.java
+4
-30
未找到文件。
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceDetailFactory.java
浏览文件 @
f4ad7ad1
...
...
@@ -1035,16 +1035,16 @@ public class AttendanceDetailFactory extends AbstractFactory {
Root
<
AttendanceDetail
>
root
=
cq
.
from
(
AttendanceDetail
.
class
);
cq
.
select
(
root
.
get
(
AttendanceDetail_
.
id
));
Predicate
p
=
cb
.
equal
(
root
.
get
(
AttendanceDetail_
.
recordDateString
),
recordDate
);
if
(
StringUtils
.
equalsAnyIgnoreCase
(
"onDuty"
)){
if
(
StringUtils
.
equalsAnyIgnoreCase
(
"onDuty"
,
type
)){
Predicate
p_type
=
cb
.
lessThan
(
root
.
get
(
AttendanceDetail_
.
onDutyTime
),
deadlineTime
);
p
=
cb
.
and
(
p
,
p_type
);
}
else
if
(
StringUtils
.
equalsAnyIgnoreCase
(
"offDuty"
)){
}
else
if
(
StringUtils
.
equalsAnyIgnoreCase
(
"offDuty"
,
type
)){
Predicate
p_type
=
cb
.
lessThan
(
root
.
get
(
AttendanceDetail_
.
offDutyTime
),
deadlineTime
);
p
=
cb
.
and
(
p
,
p_type
);
}
else
if
(
StringUtils
.
equalsAnyIgnoreCase
(
"morningOffDuty"
)){
}
else
if
(
StringUtils
.
equalsAnyIgnoreCase
(
"morningOffDuty"
,
type
)){
Predicate
p_type
=
cb
.
lessThan
(
root
.
get
(
AttendanceDetail_
.
morningOffDutyTime
),
deadlineTime
);
p
=
cb
.
and
(
p
,
p_type
);
}
else
if
(
StringUtils
.
equalsAnyIgnoreCase
(
"afternoonOnDuty"
)){
}
else
if
(
StringUtils
.
equalsAnyIgnoreCase
(
"afternoonOnDuty"
,
type
)){
Predicate
p_type
=
cb
.
lessThan
(
root
.
get
(
AttendanceDetail_
.
afternoonOnDutyTime
),
deadlineTime
);
p
=
cb
.
and
(
p
,
p_type
);
}
else
{
...
...
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/jaxrs/document/ActionPersistPublishContent.java
浏览文件 @
f4ad7ad1
...
...
@@ -462,8 +462,8 @@ public class ActionPersistPublishContent extends BaseAction {
@FieldDescribe
(
"文档操作者身份"
)
private
String
identity
=
null
;
@FieldDescribe
(
"数据的路径列表."
)
private
String
[]
dataPaths
=
null
;
//
@FieldDescribe( "数据的路径列表." )
//
private String[] dataPaths = null;
@FieldDescribe
(
"启动流程的JobId."
)
private
String
wf_jobId
=
null
;
...
...
@@ -974,16 +974,16 @@ public class ActionPersistPublishContent extends BaseAction {
this
.
readerList
=
readerList
;
}
public
String
[]
getDataPaths
()
{
if
(
dataPaths
!=
null
&&
dataPaths
.
length
==
1
&&
dataPaths
[
0
].
equals
(
"null"
)){
return
null
;
}
return
dataPaths
;
}
public
void
setDataPaths
(
String
[]
dataPaths
)
{
this
.
dataPaths
=
dataPaths
;
}
//
public String[] getDataPaths() {
//
if( dataPaths != null && dataPaths.length == 1 && dataPaths[0].equals("null")){
//
return null;
//
}
//
return dataPaths;
//
}
//
//
public void setDataPaths(String[] dataPaths) {
//
this.dataPaths = dataPaths;
//
}
public
Map
<?,
?>
getDocData
()
{
return
docData
;
...
...
o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/queue/QueueSendDocumentNotify.java
浏览文件 @
f4ad7ad1
...
...
@@ -30,6 +30,7 @@ public class QueueSendDocumentNotify extends AbstractQueue<Document> {
private
static
Logger
logger
=
LoggerFactory
.
getLogger
(
QueueSendDocumentNotify
.
class
);
public
void
execute
(
Document
document
)
throws
Exception
{
logger
.
info
(
">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>QueueSendDocumentNotify:"
+
document
.
getTitle
()
);
if
(
document
==
null
)
{
logger
.
info
(
"can not send publish notify , document is NULL!"
);
return
;
...
...
@@ -42,43 +43,16 @@ public class QueueSendDocumentNotify extends AbstractQueue<Document> {
try
(
EntityManagerContainer
emc
=
EntityManagerContainerFactory
.
instance
().
create
())
{
AppInfo
appInfo
=
emc
.
find
(
document
.
getAppId
(),
AppInfo
.
class
);
CategoryInfo
category
=
emc
.
find
(
document
.
getCategoryId
(),
CategoryInfo
.
class
);
// Boolean sendNotify = false;
if
(
appInfo
!=
null
&&
category
!=
null
)
{
// //根据栏目和分类配置判断是否需要提醒
// if(StringUtils.equals( "信息", document.getDocumentType() )) {
// if( category.getSendNotify() == null ) {
// if( appInfo.getSendNotify() == null ) {
// //都为空,默认发送通知
// sendNotify = true;
// }else {
// sendNotify = appInfo.getSendNotify();
// }
// }else {
// sendNotify = category.getSendNotify();
// }
// }else {
// //数据类型,只有分类设置了需要通知,才会有通知,为空和为false都不通知
// if( category.getSendNotify() ) {
// sendNotify = true;
// }
// }
// if( sendNotify ) {
//计算该文档有多少阅读者
ReviewService
reviewService
=
new
ReviewService
();
List
<
String
>
persons
=
reviewService
.
listPermissionPersons
(
appInfo
,
category
,
document
);
if
(
ListTools
.
isNotEmpty
(
persons
))
{
//有可能是*, 一般是所有的人员标识列表
if
(
persons
.
contains
(
"*"
))
{
logger
.
info
(
">>>>>document.getCreatorTopUnitName()="
+
document
.
getCreatorTopUnitName
()
);
List
<
String
>
allPersons
=
listPersonWithUnit
(
document
.
getCreatorTopUnitName
()
);
if
(
ListTools
.
isNotEmpty
(
allPersons
))
{
for
(
String
person
:
persons
)
{
if
(
StringUtils
.
equals
(
"*"
,
person
)
&&
allPersons
.
contains
(
person
))
{
allPersons
.
add
(
person
);
}
}
}
persons
=
allPersons
;
persons
=
listPersonWithUnit
(
document
.
getCreatorTopUnitName
()
);
}
}
if
(
ListTools
.
isNotEmpty
(
persons
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录