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
791974e0
Commit
791974e0
authored
Aug 24, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改用户等
parent
00ae6d52
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java
...odule/attendance/service/work/FixWorkOtherAttendance.java
+5
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/work/FixWorkOtherAttendance.java
View file @
791974e0
...
@@ -82,7 +82,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
...
@@ -82,7 +82,6 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
return
;
return
;
}
}
//特殊日期考勤配置
//特殊日期考勤配置
List
<
AttendanceGroupFixedworkSpecialEntity
>
specialEntities
=
specialService
.
find
(
new
AttendanceGroupFixedworkSpecialQuery
().
fixedWorkId
(
attendanceGroupFixedworkEntity
.
getId
()));
List
<
AttendanceGroupFixedworkSpecialEntity
>
specialEntities
=
specialService
.
find
(
new
AttendanceGroupFixedworkSpecialQuery
().
fixedWorkId
(
attendanceGroupFixedworkEntity
.
getId
()));
if
(!
ObjectUtils
.
isEmpty
(
specialEntities
))
{
if
(!
ObjectUtils
.
isEmpty
(
specialEntities
))
{
...
@@ -154,8 +153,13 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
...
@@ -154,8 +153,13 @@ public class FixWorkOtherAttendance extends AttendanceWorkAbstract {
AttendanceRecordDetailEntity
recordDetailEntity
=
new
AttendanceRecordDetailEntity
();
AttendanceRecordDetailEntity
recordDetailEntity
=
new
AttendanceRecordDetailEntity
();
recordDetailEntity
.
setShiftsId
(
classDetailEntity
.
getId
());
recordDetailEntity
.
setShiftsId
(
classDetailEntity
.
getId
());
recordDetailEntity
.
setShiftsName
(
classDetailEntity
.
getClassName
());
recordDetailEntity
.
setShiftsName
(
classDetailEntity
.
getClassName
());
recordDetailEntity
.
setGoWorkResult
(
GoWorkResultEnum
.
缺卡
.
getValue
());
recordDetailEntity
.
setGoWorkResult
(
GoWorkResultEnum
.
缺卡
.
getValue
());
recordDetailEntity
.
setGoWorkDate
(
DateUtil
.
parse
(
commonData
.
getDateStr
()
+
" "
+
DateUtil
.
formatTime
(
classDetailEntity
.
getGoWorkDate
())));
recordDetailEntity
.
setOffWorkResult
(
GoWorkResultEnum
.
缺卡
.
getValue
());
recordDetailEntity
.
setOffWorkResult
(
GoWorkResultEnum
.
缺卡
.
getValue
());
recordDetailEntity
.
setOffWorkDate
(
DateUtil
.
parse
(
commonData
.
getDateStr
()
+
" "
+
DateUtil
.
formatTime
(
classDetailEntity
.
getGoWorkDate
())));
recordDetailEntity
.
setOrderNum
(
orderNum
);
recordDetailEntity
.
setOrderNum
(
orderNum
);
commonData
.
getDetailEntityList
().
add
(
recordDetailEntity
);
commonData
.
getDetailEntityList
().
add
(
recordDetailEntity
);
}
}
...
...
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