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
22692cb7
Commit
22692cb7
authored
Mar 12, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
取消前端时间间隔校验,由后端进行判断
parent
6e5aa6ba
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
27 additions
and
3 deletions
+27
-3
attendance-performance-manager/src/main/java/com/mortals/xhx/daemon/task/CalculateDayAttendTaskImpl.java
...m/mortals/xhx/daemon/task/CalculateDayAttendTaskImpl.java
+0
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java
...tendance/service/impl/AttendanceRecordHikServiceImpl.java
+25
-0
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/CalculateDayAttendTaskImpl.java
View file @
22692cb7
...
...
@@ -89,7 +89,6 @@ public class CalculateDayAttendTaskImpl implements ITaskExcuteService {
StaffEntity
staffCache
=
staffService
.
getCache
(
staffId
.
toString
());
if
(!
ObjectUtils
.
isEmpty
(
staffCache
)
&&
StaffSatusEnum
.
离职
.
getValue
()
!=
staffCache
.
getStatus
())
{
//构建考勤记录 判断当前人是否离职,如果非离职 构建记录
AttendanceRecordHikEntity
recordHikEntity
=
new
AttendanceRecordHikEntity
();
recordHikEntity
.
initAttrValue
();
recordHikEntity
.
setStaffId
(
staffCache
.
getId
());
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java
View file @
22692cb7
...
...
@@ -812,6 +812,31 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
@Override
public
void
buildSourceHikRecord
(
AttendanceRecordHikQuery
recordHikQuery
,
Context
context
)
{
syncDoorEvents
(
recordHikQuery
);
deletFackRecord
(
recordHikQuery
,
context
);
}
private
void
deletFackRecord
(
AttendanceRecordHikQuery
recordHikQuery
,
Context
context
)
{
//重新拉去的考勤记录,判断是否存在虚增的记录
log
.
info
(
"开始删除虚增的记录!"
);
recordHikQuery
.
setEventSource
(
"当日未有记录虚增考勤记录!"
);
List
<
AttendanceRecordHikEntity
>
fackAttendlist
=
this
.
find
(
recordHikQuery
);
if
(!
ObjectUtils
.
isEmpty
(
fackAttendlist
)){
log
.
info
(
"虚增的记录:{}"
,
fackAttendlist
.
size
());
for
(
AttendanceRecordHikEntity
recordHikEntity
:
fackAttendlist
)
{
//判断是否已经重新有新的当日数据,如果有 则删除当前虚增记录
AttendanceRecordHikQuery
query
=
new
AttendanceRecordHikQuery
();
query
.
setStaffId
(
recordHikEntity
.
getStaffId
());
query
.
setAttendanceDateStart
(
recordHikEntity
.
getAttendanceDateStart
());
query
.
setAttendanceDateEnd
(
recordHikQuery
.
getAttendanceDateEnd
());
query
.
setIdNotList
(
Arrays
.
asList
(
recordHikEntity
.
getId
()));
int
count
=
this
.
count
(
query
,
context
);
if
(
count
>
0
){
//删除当前虚增的记录
this
.
remove
(
recordHikEntity
.
getId
(),
context
);
}
}
}
}
private
void
syncDoorEvents
(
AttendanceRecordHikQuery
recordHikQuery
)
{
...
...
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
View file @
22692cb7
...
...
@@ -72,8 +72,8 @@ Authorization: {{authToken}}
Content-Type: application/json
{
"attendanceDateStart":"2024-0
2-0
1",
"attendanceDateEnd":"2024-03-
0
1"
"attendanceDateStart":"2024-0
3-1
1",
"attendanceDateEnd":"2024-03-
1
1"
}
...
...
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