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
8898de3e
Commit
8898de3e
authored
Sep 06, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改用户等
parent
d56c35d6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
...ava/com/mortals/xhx/module/staff/web/StaffController.java
+3
-3
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/staff/web/StaffController.java
View file @
8898de3e
...
...
@@ -118,7 +118,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
AttendanceRecordHikQuery
hikQuery
=
new
AttendanceRecordHikQuery
();
hikQuery
.
setAttendanceDateStart
(
DateUtil
.
beginOfMonth
(
new
Date
()).
toDateStr
());
hikQuery
.
setAttendanceDateEnd
(
DateUtil
.
today
());
hikQuery
.
set
StaffId
(
entity
.
getId
());
hikQuery
.
set
WorkNum
(
entity
.
getWorkNum
());
//出勤天数
Map
<
String
,
List
<
AttendanceRecordHikEntity
>>
collect
=
recordHikService
.
find
(
hikQuery
,
context
).
stream
().
collect
(
Collectors
.
groupingBy
(
x
->
DateUtil
.
formatDate
(
x
.
getAttendanceDate
())));
...
...
@@ -128,7 +128,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
AttendanceRecordQuery
attendanceRecordQuery
=
new
AttendanceRecordQuery
();
attendanceRecordQuery
.
setAttendanceDateStart
(
DateUtil
.
beginOfMonth
(
new
Date
()).
toDateStr
());
attendanceRecordQuery
.
setAttendanceDateEnd
(
DateUtil
.
today
());
attendanceRecordQuery
.
set
StaffId
(
entity
.
getId
());
attendanceRecordQuery
.
set
WorkNum
(
entity
.
getWorkNum
());
List
<
AttendanceRecordEntity
>
attendanceRecordEntities
=
recordService
.
find
(
attendanceRecordQuery
);
...
...
@@ -175,7 +175,7 @@ public class StaffController extends BaseCRUDJsonBodyMappingController<StaffServ
vo
.
setWorkFormalDay
(
entity
.
getRegularDate
());
vo
.
setAttendanceCount
(
attendDays
);
vo
.
setLeaveCount
(
levealPersonNum
);
vo
.
setLateCount
(
beLate
);
vo
.
setLateCount
(
beLate
+
leaveEarly
);
vo
.
setMinerCount
(
0L
);
vo
.
setLackCardCount
(
lackOfCards
);
vo
.
setWorkOverDay
(
0L
);
...
...
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