Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-platform
Commits
b08f3f62
Commit
b08f3f62
authored
Jan 03, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加统计异常详细信息
parent
5bfabe11
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
29 deletions
+21
-29
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventTaskImpl.java
...a/com/mortals/xhx/daemon/task/SyncDoorsEventTaskImpl.java
+8
-8
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java
...odule/attendance/service/work/FixWorkOtherAttendance.java
+11
-19
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
...-manager/src/test/java/com/mortals/httpclient/system.http
+2
-2
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/SyncDoorsEventTaskImpl.java
View file @
b08f3f62
...
...
@@ -77,14 +77,14 @@ public class SyncDoorsEventTaskImpl implements ITaskExcuteService {
private
void
syncDoorEvents
()
{
DoorEventReq
doorEventReq
=
new
DoorEventReq
();
List
<
Integer
>
eventTypes
=
new
ArrayList
<>();
//
eventTypes.add(196885);
//
eventTypes.add(196887);
//
eventTypes.add(196893);
//
eventTypes.add(196888);
//
eventTypes.add(196889);
//
eventTypes.add(196890);
//
eventTypes.add(196891);
eventTypes
.
add
(
196893
);
//人脸认证通过
eventTypes
.
add
(
196885
);
eventTypes
.
add
(
196887
);
eventTypes
.
add
(
196893
);
eventTypes
.
add
(
196888
);
eventTypes
.
add
(
196889
);
eventTypes
.
add
(
196890
);
eventTypes
.
add
(
196891
);
//
eventTypes.add(196893);//人脸认证通过
doorEventReq
.
setEventTypes
(
eventTypes
);
// 获取当天的开始时间
//Date todayStart = DateUtil.offsetHour(new Date(), -5).toJdkDate();
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java
View file @
b08f3f62
...
...
@@ -404,7 +404,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
errorEntityList
.
add
(
errorEntity
);
}
}
if
(!
ObjectUtils
.
isEmpty
(
errorEntityList
))
{
//删除当前员工当日未处理的异常后,重新添加
AttendanceRecordErrorQuery
errorQuery
=
new
AttendanceRecordErrorQuery
();
errorQuery
.
setErrorDateTimeStart
(
dateStr
);
...
...
@@ -414,15 +413,11 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
Long
[]
errorIds
=
errorService
.
find
(
errorQuery
).
stream
().
map
(
i
->
i
.
getId
()).
toArray
(
Long
[]::
new
);
if
(
attendanceRecordEntity
.
getStaffId
()==
191L
){
log
.
info
(
"删除异常id:{}"
,
JSON
.
toJSONString
(
errorIds
));
}
if
(!
ObjectUtils
.
isEmpty
(
errorIds
))
{
errorService
.
remove
(
errorIds
,
context
);
}
if
(!
ObjectUtils
.
isEmpty
(
errorEntityList
))
{
for
(
AttendanceRecordErrorEntity
errorEntity
:
errorEntityList
)
{
//查看是否存在相同的异常记录,如果存在 则不添加
errorQuery
=
new
AttendanceRecordErrorQuery
();
...
...
@@ -444,9 +439,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
}
if
(!
ObjectUtils
.
isEmpty
(
errorSwitchNormalList
))
{
//删除异常记录
}
}
...
...
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
View file @
b08f3f62
...
...
@@ -33,8 +33,8 @@ Authorization: {{authToken}}
Content-Type: application/json
{
"attendanceDateStart":"2023-12-
08
",
"attendanceDateEnd":"2023-12-
08
"
"attendanceDateStart":"2023-12-
29
",
"attendanceDateEnd":"2023-12-
29
"
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment