Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
538abc0e
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,发现更多精彩内容 >>
提交
538abc0e
编写于
12月 21, 2020
作者:
NoSubject
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'wrdp' into 'develop'
Wrdp See merge request o2oa/o2oa!2556
上级
11dfc0d7
cff57c26
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
28 addition
and
6 deletion
+28
-6
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceSelfHolidayFactory.java
...ssemble/control/factory/AttendanceSelfHolidayFactory.java
+2
-2
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionExportAbnormalDetail.java
.../control/jaxrs/attachment/ActionExportAbnormalDetail.java
+16
-3
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/config/ActionSetProxy.java
...ava/com/x/program/center/jaxrs/config/ActionSetProxy.java
+9
-1
o2server/x_program_center/src/main/webapp/jest/list.html
o2server/x_program_center/src/main/webapp/jest/list.html
+1
-0
未找到文件。
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/factory/AttendanceSelfHolidayFactory.java
浏览文件 @
538abc0e
...
...
@@ -147,12 +147,12 @@ public class AttendanceSelfHolidayFactory extends AbstractFactory {
index
++;
}
if
(
null
!=
wrapIn
.
getUnitNames
()
&&
wrapIn
.
getUnitNames
().
size
()>
0
)
{
sql_stringBuffer
.
append
(
" and o.unit
Name
in ( ?"
+
(
index
)
+
")"
);
sql_stringBuffer
.
append
(
" and o.unit
Ou
in ( ?"
+
(
index
)
+
")"
);
vs
.
add
(
wrapIn
.
getUnitNames
()
);
index
++;
}
if
(
null
!=
wrapIn
.
getTopUnitNames
()
&&
wrapIn
.
getTopUnitNames
().
size
()
>
0
)
{
sql_stringBuffer
.
append
(
" and o.topUnit
Name
in ( ?"
+
(
index
)
+
")"
);
sql_stringBuffer
.
append
(
" and o.topUnit
Ou
in ( ?"
+
(
index
)
+
")"
);
vs
.
add
(
wrapIn
.
getTopUnitNames
()
);
index
++;
}
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attachment/ActionExportAbnormalDetail.java
浏览文件 @
538abc0e
...
...
@@ -7,6 +7,7 @@ import java.util.List;
import
javax.servlet.http.HttpServletRequest
;
import
com.x.base.core.project.tools.ListTools
;
import
org.apache.commons.lang3.StringUtils
;
import
org.apache.poi.hssf.usermodel.HSSFWorkbook
;
import
org.apache.poi.ss.usermodel.Row
;
import
org.apache.poi.ss.usermodel.Sheet
;
...
...
@@ -110,9 +111,21 @@ public class ActionExportAbnormalDetail extends BaseAction {
for
(
int
i
=
0
;
i
<
detailList
.
size
();
i
++)
{
attendanceDetail
=
detailList
.
get
(
i
);
row
=
sheet
.
createRow
(
i
+
1
);
row
.
createCell
(
0
).
setCellValue
(
attendanceDetail
.
getTopUnitName
());
row
.
createCell
(
1
).
setCellValue
(
attendanceDetail
.
getUnitName
());
row
.
createCell
(
2
).
setCellValue
(
attendanceDetail
.
getEmpName
());
String
topUnitName
=
attendanceDetail
.
getTopUnitName
();
String
unitName
=
attendanceDetail
.
getUnitName
();
String
empName
=
attendanceDetail
.
getEmpName
();
if
(
StringUtils
.
isNotEmpty
(
topUnitName
)
&&
StringUtils
.
contains
(
topUnitName
,
"@"
)){
topUnitName
=
topUnitName
.
split
(
"@"
)[
0
];
}
if
(
StringUtils
.
isNotEmpty
(
unitName
)
&&
StringUtils
.
contains
(
unitName
,
"@"
)){
unitName
=
unitName
.
split
(
"@"
)[
0
];
}
if
(
StringUtils
.
isNotEmpty
(
empName
)
&&
StringUtils
.
contains
(
empName
,
"@"
)){
empName
=
empName
.
split
(
"@"
)[
0
];
}
row
.
createCell
(
0
).
setCellValue
(
topUnitName
);
row
.
createCell
(
1
).
setCellValue
(
unitName
);
row
.
createCell
(
2
).
setCellValue
(
empName
);
row
.
createCell
(
3
).
setCellValue
(
attendanceDetail
.
getRecordDateString
());
if
(
attendanceDetail
.
getIsAbsent
())
{
row
.
createCell
(
4
).
setCellValue
(
"缺勤"
);
...
...
o2server/x_program_center/src/main/java/com/x/program/center/jaxrs/config/ActionSetProxy.java
浏览文件 @
538abc0e
...
...
@@ -35,13 +35,21 @@ class ActionSetProxy extends BaseAction {
}
}
for
(
Application
o
:
wi
.
getApplicationList
())
{
Node
node
=
Config
.
nodes
().
get
(
o
.
getNode
());
Node
node
=
null
;
if
(
o
.
getNode
().
equalsIgnoreCase
(
""
))
{
node
=
Config
.
nodes
().
get
(
"127.0.0.1"
);
}
else
{
node
=
Config
.
nodes
().
get
(
o
.
getNode
());
}
if
(
null
!=
node
)
{
node
.
getApplication
().
setProxyHost
(
o
.
getProxyHost
());
node
.
getApplication
().
setProxyPort
(
o
.
getProxyPort
());
}
}
Config
.
nodes
().
save
();
this
.
configFlush
(
effectivePerson
);
Wo
wo
=
new
Wo
();
...
...
o2server/x_program_center/src/main/webapp/jest/list.html
浏览文件 @
538abc0e
...
...
@@ -118,6 +118,7 @@
crossDomain
:
true
,
error
:
function
(
e
){
$
(
'
#contentTable
'
).
hide
();
$
(
'
#content
'
).
html
(
"
<div align = 'center'>您没有权限查看,请以管理员身份登入!</div>
"
);
}
}).
done
(
function
(
json
)
{
if
(
json
.
type
==
'
success
'
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录