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
2d7b4153
Commit
2d7b4153
authored
Aug 07, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改固定班次考勤
parent
5f7de824
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordEntity.java
...s/xhx/module/attendance/model/AttendanceRecordEntity.java
+1
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordHikEntity.java
...hx/module/attendance/model/AttendanceRecordHikEntity.java
+1
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordErrorController.java
...odule/attendance/web/AttendanceRecordErrorController.java
+1
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordEntity.java
View file @
2d7b4153
...
@@ -64,7 +64,7 @@ public class AttendanceRecordEntity extends AttendanceRecordVo {
...
@@ -64,7 +64,7 @@ public class AttendanceRecordEntity extends AttendanceRecordVo {
/**
/**
* 打卡日期
* 打卡日期
*/
*/
@Excel
(
name
=
"打卡日期"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
@Excel
(
name
=
"打卡日期"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd
HH:mm:ss
"
)
private
Date
attendanceDate
;
private
Date
attendanceDate
;
/**
/**
* 备注
* 备注
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/model/AttendanceRecordHikEntity.java
View file @
2d7b4153
...
@@ -67,7 +67,7 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
...
@@ -67,7 +67,7 @@ public class AttendanceRecordHikEntity extends AttendanceRecordHikVo {
/**
/**
* 考勤日期
* 考勤日期
*/
*/
@Excel
(
name
=
"考勤日期"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd"
)
@Excel
(
name
=
"考勤日期"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd
HH:mm:ss
"
)
private
Date
attendanceDate
;
private
Date
attendanceDate
;
/**
/**
* 考勤点名称
* 考勤点名称
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordErrorController.java
View file @
2d7b4153
...
@@ -173,7 +173,7 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
...
@@ -173,7 +173,7 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
recordDetailEntity
.
setOffWorkResult
(
1
);
recordDetailEntity
.
setOffWorkResult
(
1
);
}
}
}
else
{
}
else
{
if
(
item
.
getGoOrOff
().
equals
(
"
下班
"
))
{
if
(
item
.
getGoOrOff
().
equals
(
""
))
{
recordDetailEntity
.
setOffWorkResult
(
1
);
recordDetailEntity
.
setOffWorkResult
(
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