Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
e5c18da8
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,发现更多精彩内容 >>
提交
e5c18da8
编写于
7月 16, 2020
作者:
L
luojing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
考勤模板修改,并修改对应接口数据
上级
ca6d2e4c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
82 addition
and
6 deletion
+82
-6
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/processor/EntityImportDataDetail.java
...ce/assemble/control/processor/EntityImportDataDetail.java
+40
-0
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/processor/thread/OperatorDataSaver.java
.../assemble/control/processor/thread/OperatorDataSaver.java
+2
-0
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/processor/thread/OperatorDataValidator.java
...emble/control/processor/thread/OperatorDataValidator.java
+40
-6
未找到文件。
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/processor/EntityImportDataDetail.java
浏览文件 @
e5c18da8
...
...
@@ -34,10 +34,18 @@ public class EntityImportDataDetail extends AbStractDataForOperator {
private
String
onDutyTime
=
""
;
private
String
morningOffDutyTime
=
""
;
private
String
afternoonOnDutyTime
=
""
;
private
String
offDutyTime
=
""
;
private
String
onDutyTimeFormated
=
""
;
private
String
morningOffDutyTimeFormated
=
""
;
private
String
afternoonOnDutyTimeFormated
=
""
;
private
String
offDutyTimeFormated
=
""
;
private
String
recordDateStringFormated
=
""
;
...
...
@@ -87,6 +95,22 @@ public class EntityImportDataDetail extends AbStractDataForOperator {
public
void
setOnDutyTime
(
String
onDutyTime
)
{
this
.
onDutyTime
=
onDutyTime
;
}
public
String
getMorningOffDutyTime
()
{
return
morningOffDutyTime
;
}
public
void
setMorningOffDutyTime
(
String
morningOffDutyTime
)
{
this
.
morningOffDutyTime
=
morningOffDutyTime
;
}
public
String
getAfternoonOnDutyTime
()
{
return
afternoonOnDutyTime
;
}
public
void
setAfternoonOnDutyTime
(
String
afternoonOnDutyTime
)
{
this
.
afternoonOnDutyTime
=
afternoonOnDutyTime
;
}
public
String
getOffDutyTime
()
{
return
offDutyTime
;
...
...
@@ -103,6 +127,22 @@ public class EntityImportDataDetail extends AbStractDataForOperator {
public
void
setOnDutyTimeFormated
(
String
onDutyTimeFormated
)
{
this
.
onDutyTimeFormated
=
onDutyTimeFormated
;
}
public
String
getMorningOffDutyTimeFormated
()
{
return
morningOffDutyTimeFormated
;
}
public
void
setMorningOffDutyTimeFormated
(
String
morningOffDutyTimeFormated
)
{
this
.
morningOffDutyTimeFormated
=
morningOffDutyTimeFormated
;
}
public
String
getAfternoonOnDutyTimeFormated
()
{
return
afternoonOnDutyTimeFormated
;
}
public
void
setAfternoonOnDutyTimeFormated
(
String
afternoonOnDutyTimeFormated
)
{
this
.
afternoonOnDutyTimeFormated
=
afternoonOnDutyTimeFormated
;
}
public
String
getOffDutyTimeFormated
()
{
return
offDutyTimeFormated
;
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/processor/thread/OperatorDataSaver.java
浏览文件 @
e5c18da8
...
...
@@ -48,6 +48,8 @@ public class OperatorDataSaver implements Runnable {
attendanceDetail
.
setRecordDate
(
cacheImportRowDetail
.
getRecordDate
()
);
attendanceDetail
.
setRecordDateString
(
cacheImportRowDetail
.
getRecordDateStringFormated
());
attendanceDetail
.
setOnDutyTime
(
cacheImportRowDetail
.
getOnDutyTimeFormated
());
attendanceDetail
.
setMorningOffDutyTime
(
cacheImportRowDetail
.
getMorningOffDutyTimeFormated
());
attendanceDetail
.
setAfternoonOnDutyTime
(
cacheImportRowDetail
.
getAfternoonOnDutyTimeFormated
());
attendanceDetail
.
setOffDutyTime
(
cacheImportRowDetail
.
getOffDutyTimeFormated
());
attendanceDetail
.
setRecordStatus
(
0
);
attendanceDetail
.
setBatchName
(
file_id
);
...
...
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/processor/thread/OperatorDataValidator.java
浏览文件 @
e5c18da8
...
...
@@ -79,11 +79,17 @@ public class OperatorDataValidator implements Runnable {
cacheImportRowDetail
.
setRecordDateString
(
colmlist
.
get
(
2
)
);
//打卡日期
if
(
colmlist
.
size
()
>
3
){
cacheImportRowDetail
.
setOnDutyTime
(
colmlist
.
get
(
3
)
);
//上班打卡时间
cacheImportRowDetail
.
setOnDutyTime
(
colmlist
.
get
(
3
)
);
//上
午上
班打卡时间
}
if
(
colmlist
.
size
()
>
4
){
cacheImportRowDetail
.
setOffDutyTime
(
colmlist
.
get
(
4
)
);
//下班打卡时间
cacheImportRowDetail
.
setMorningOffDutyTime
(
colmlist
.
get
(
4
)
);
//上午下班打卡时间
}
if
(
colmlist
.
size
()
>
5
){
cacheImportRowDetail
.
setAfternoonOnDutyTime
(
colmlist
.
get
(
5
)
);
//下午上班打卡时间
}
if
(
colmlist
.
size
()
>
6
){
cacheImportRowDetail
.
setOffDutyTime
(
colmlist
.
get
(
6
)
);
//下午下班打卡时间
}
cacheImportRowDetail
.
setCheckStatus
(
"success"
);
//设置数据检查状态为正常
...
...
@@ -145,16 +151,44 @@ public class OperatorDataValidator implements Runnable {
if
(
cacheImportRowDetail
.
getOnDutyTime
()
!=
null
&&
cacheImportRowDetail
.
getOnDutyTime
().
trim
().
length
()
>
0
){
try
{
datetime
=
dateOperation
.
getDateFromString
(
cacheImportRowDetail
.
getOnDutyTime
()
);
cacheImportRowDetail
.
setOnDutyTimeFormated
(
dateOperation
.
getDateStringFromDate
(
datetime
,
"HH:mm:ss"
)
);
//上班打卡时间
cacheImportRowDetail
.
setOnDutyTimeFormated
(
dateOperation
.
getDateStringFromDate
(
datetime
,
"HH:mm:ss"
)
);
//上
午上
班打卡时间
}
catch
(
Exception
e
){
checkSuccess
=
false
;
cacheImportRowDetail
.
setCheckStatus
(
"error"
);
cacheImportRowDetail
.
setDescription
(
cacheImportRowDetail
.
getDescription
()
+
"上班打卡时间格式异常:"
+
cacheImportRowDetail
.
getOnDutyTime
()
);
cacheImportRowDetail
.
setDescription
(
cacheImportRowDetail
.
getDescription
()
+
"上
午上
班打卡时间格式异常:"
+
cacheImportRowDetail
.
getOnDutyTime
()
);
logger
.
info
(
"step 2, data check on row "
+
curRow
+
", found an error!format on field 'onDutyTime':"
+
cacheImportRowDetail
.
getOnDutyTime
(),
e
);
}
}
}
if
(
checkSuccess
)
{
if
(
cacheImportRowDetail
.
getMorningOffDutyTime
()
!=
null
&&
cacheImportRowDetail
.
getMorningOffDutyTime
().
trim
().
length
()
>
0
){
try
{
datetime
=
dateOperation
.
getDateFromString
(
cacheImportRowDetail
.
getMorningOffDutyTime
()
);
cacheImportRowDetail
.
setMorningOffDutyTimeFormated
(
dateOperation
.
getDateStringFromDate
(
datetime
,
"HH:mm:ss"
)
);
//上午下班打卡时间
}
catch
(
Exception
e
){
checkSuccess
=
false
;
cacheImportRowDetail
.
setCheckStatus
(
"error"
);
cacheImportRowDetail
.
setDescription
(
cacheImportRowDetail
.
getDescription
()
+
"上午下班打卡时间格式异常:"
+
cacheImportRowDetail
.
getMorningOffDutyTime
()
);
logger
.
info
(
"step 2, data check on row "
+
curRow
+
", found an error!format on field 'onDutyTime':"
+
cacheImportRowDetail
.
getMorningOffDutyTime
(),
e
);
}
}
}
if
(
checkSuccess
)
{
if
(
cacheImportRowDetail
.
getAfternoonOnDutyTime
()
!=
null
&&
cacheImportRowDetail
.
getAfternoonOnDutyTime
().
trim
().
length
()
>
0
){
try
{
datetime
=
dateOperation
.
getDateFromString
(
cacheImportRowDetail
.
getAfternoonOnDutyTime
()
);
cacheImportRowDetail
.
setAfternoonOnDutyTimeFormated
(
dateOperation
.
getDateStringFromDate
(
datetime
,
"HH:mm:ss"
)
);
//上午下班打卡时间
}
catch
(
Exception
e
){
checkSuccess
=
false
;
cacheImportRowDetail
.
setCheckStatus
(
"error"
);
cacheImportRowDetail
.
setDescription
(
cacheImportRowDetail
.
getDescription
()
+
"上午下班打卡时间格式异常:"
+
cacheImportRowDetail
.
getAfternoonOnDutyTime
()
);
logger
.
info
(
"step 2, data check on row "
+
curRow
+
", found an error!format on field 'onDutyTime':"
+
cacheImportRowDetail
.
getAfternoonOnDutyTime
(),
e
);
}
}
}
if
(
checkSuccess
)
{
if
(
cacheImportRowDetail
.
getOffDutyTime
()
!=
null
&&
cacheImportRowDetail
.
getOffDutyTime
().
trim
().
length
()
>
0
){
try
{
...
...
@@ -163,7 +197,7 @@ public class OperatorDataValidator implements Runnable {
}
catch
(
Exception
e
){
checkSuccess
=
false
;
cacheImportRowDetail
.
setCheckStatus
(
"error"
);
cacheImportRowDetail
.
setDescription
(
cacheImportRowDetail
.
getDescription
()
+
"下班打卡时间格式异常:"
+
cacheImportRowDetail
.
getOffDutyTime
()
);
cacheImportRowDetail
.
setDescription
(
cacheImportRowDetail
.
getDescription
()
+
"下
午下
班打卡时间格式异常:"
+
cacheImportRowDetail
.
getOffDutyTime
()
);
logger
.
info
(
"step 2, data check on row "
+
curRow
+
", found an error!format on field 'offDutyTime':"
+
cacheImportRowDetail
.
getOffDutyTime
(),
e
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录