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
24ae5e1d
Commit
24ae5e1d
authored
Jan 18, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加缺勤自定义天数计算
parent
6fe81f1f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
4 deletions
+3
-4
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java
...tendance/service/impl/AttendanceRecordHikServiceImpl.java
+1
-2
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/module/attendance/service/impl/AttendanceRecordHikServiceImpl.java
View file @
24ae5e1d
...
...
@@ -759,7 +759,6 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
StaffEntity
staffCache
=
staffService
.
getCache
(
staffId
.
toString
());
if
(!
ObjectUtils
.
isEmpty
(
staffCache
)
&&
StaffSatusEnum
.
离职
.
getValue
()
!=
staffCache
.
getStatus
())
{
//构建考勤记录 判断当前人是否离职,如果非离职 构建记录
AttendanceRecordHikEntity
recordHikEntity
=
new
AttendanceRecordHikEntity
();
recordHikEntity
.
initAttrValue
();
recordHikEntity
.
setStaffId
(
staffCache
.
getId
());
...
...
@@ -772,7 +771,7 @@ public class AttendanceRecordHikServiceImpl extends AbstractCRUDServiceImpl<Atte
recordHikEntity
.
setPositionId
(
staffCache
.
getPositionId
());
recordHikEntity
.
setPositionName
(
staffCache
.
getPositionName
());
recordHikEntity
.
setAttendanceGroupId
(
groupId
);
recordHikEntity
.
setAttendanceDate
(
DateUtil
.
parseDate
(
DateUtil
.
today
()).
toJdkDate
());
recordHikEntity
.
setAttendanceDate
(
DateUtil
.
parseDate
(
recordHikQuery
.
getAttendanceDateStart
()).
toJdkDate
());
recordHikEntity
.
setAttendanceAddress
(
"自定义地点"
);
recordHikEntity
.
setEventSource
(
"当日未有记录虚增考勤记录!"
);
recordHikEntity
.
setCreateTime
(
new
Date
());
...
...
attendance-performance-manager/src/test/java/com/mortals/httpclient/system.http
View file @
24ae5e1d
...
...
@@ -52,8 +52,8 @@ Authorization: {{authToken}}
Content-Type: application/json
{
"attendanceDateStart":"2023-12-
01
",
"attendanceDateEnd":"2023-12-
31
"
"attendanceDateStart":"2023-12-
20
",
"attendanceDateEnd":"2023-12-
20
"
}
...
...
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