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
c1214625
Commit
c1214625
authored
Jul 31, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改固定班次考勤
parent
4e54dd79
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
29 additions
and
4 deletions
+29
-4
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FreedomWorkAttendance.java
...module/attendance/service/work/FreedomWorkAttendance.java
+29
-4
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FreedomWorkAttendance.java
View file @
c1214625
...
...
@@ -4,12 +4,10 @@ import cn.hutool.core.date.DateUtil;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.framework.util.DateUtils
;
import
com.mortals.xhx.common.code.GoWorkResultEnum
;
import
com.mortals.xhx.common.code.MustEnum
;
import
com.mortals.xhx.common.code.TypeEnum
;
import
com.mortals.xhx.module.attendance.model.*
;
import
com.mortals.xhx.module.attendance.service.AttendanceClassService
;
import
com.mortals.xhx.module.attendance.service.AttendanceGroupFreeworkService
;
import
com.mortals.xhx.module.attendance.service.AttendanceRecordHikService
;
import
com.mortals.xhx.module.attendance.service.AttendanceRecordService
;
import
com.mortals.xhx.module.attendance.service.*
;
import
com.mortals.xhx.utils.SpringUtils
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.factory.annotation.Autowired
;
...
...
@@ -18,6 +16,8 @@ import org.springframework.util.ObjectUtils;
import
java.util.Arrays
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.stream.Collectors
;
/**
* 自由排班
...
...
@@ -33,6 +33,9 @@ public class FreedomWorkAttendance extends AttendanceWorkAbstract {
private
AttendanceRecordService
attendanceRecordService
;
private
AttendanceGroupFreeworkSpecialService
specialService
;
@Autowired
private
AttendanceRecordHikService
recordHikService
;
...
...
@@ -112,6 +115,28 @@ public class FreedomWorkAttendance extends AttendanceWorkAbstract {
commonData
.
getDetailEntityList
().
add
(
recordDetailEntity
);
}
}
//特殊日期考勤配置
List
<
AttendanceGroupFreeworkSpecialEntity
>
specialEntities
=
specialService
.
find
(
new
AttendanceGroupFreeworkSpecialQuery
().
freeWorkId
(
attendanceGroupFreeworkEntity
.
getId
()));
if
(!
ObjectUtils
.
isEmpty
(
specialEntities
))
{
//分组 需要考勤与不需要考勤
Map
<
Boolean
,
List
<
AttendanceGroupFreeworkSpecialEntity
>>
collect
=
specialEntities
.
stream
().
collect
(
Collectors
.
partitioningBy
(
item
->
item
.
getMust
()
==
MustEnum
.
是
.
getValue
()));
List
<
AttendanceGroupFreeworkSpecialEntity
>
mustList
=
collect
.
get
(
true
);
if
(!
ObjectUtils
.
isEmpty
(
mustList
)){
//需要打卡
for
(
AttendanceGroupFreeworkSpecialEntity
specialEntity
:
mustList
)
{
}
}
List
<
AttendanceGroupFreeworkSpecialEntity
>
mustNotList
=
collect
.
get
(
false
);
}
}
...
...
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