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
bbf1b434
Commit
bbf1b434
authored
Aug 09, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
考勤异常添加绩效考核
parent
df8fc018
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
attendance-performance-manager-ui/admin/src/views/attendance/record/error/drawershow.vue
...ui/admin/src/views/attendance/record/error/drawershow.vue
+3
-4
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordErrorController.java
...odule/attendance/web/AttendanceRecordErrorController.java
+2
-1
No files found.
attendance-performance-manager-ui/admin/src/views/attendance/record/error/drawershow.vue
View file @
bbf1b434
...
@@ -139,11 +139,10 @@
...
@@ -139,11 +139,10 @@
this
.
$message
.
error
(
'
请选择处理结果
'
)
this
.
$message
.
error
(
'
请选择处理结果
'
)
return
return
}
}
if
(
this
.
duration
&&
(
this
.
dealParams
.
processResult
==
'
早退
'
||
this
.
dealParams
.
processResult
==
'
迟到
'
)){
this
.
dealParams
.
errorStatus
=
this
.
dealParams
.
processResult
this
.
dealParams
.
processResult
=
this
.
dealParams
.
processResult
+
this
.
duration
+
'
分钟
'
if
(
this
.
duration
&&
(
this
.
dealParams
.
processResult
==
'
1
'
||
this
.
dealParams
.
processResult
==
'
2
'
)){
this
.
dealParams
.
processResult
=
this
.
dict
.
errorStatus
[
this
.
dealParams
.
processResult
]
+
this
.
duration
+
'
分钟
'
this
.
dealParams
.
durtion
=
this
.
duration
this
.
dealParams
.
durtion
=
this
.
duration
}
}
// 保存结果处理
// 保存结果处理
this
.
$post
(
this
.
urls
.
saveUrl
,
this
.
dealParams
).
then
(
res
=>
{
this
.
$post
(
this
.
urls
.
saveUrl
,
this
.
dealParams
).
then
(
res
=>
{
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceRecordErrorController.java
View file @
bbf1b434
...
@@ -143,8 +143,9 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
...
@@ -143,8 +143,9 @@ public class AttendanceRecordErrorController extends BaseCRUDJsonBodyMappingCont
for
(
AttendanceRecordErrorEntity
recordErrorEntity
:
entity
.
getRecordErrorEntities
())
{
for
(
AttendanceRecordErrorEntity
recordErrorEntity
:
entity
.
getRecordErrorEntities
())
{
AttendanceRecordErrorEntity
updateEntity
=
new
AttendanceRecordErrorEntity
();
AttendanceRecordErrorEntity
updateEntity
=
new
AttendanceRecordErrorEntity
();
updateEntity
.
setId
(
recordErrorEntity
.
getId
());
updateEntity
.
setId
(
recordErrorEntity
.
getId
());
updateEntity
.
setErrorDateTime
(
recordErrorEntity
.
getErrorDateTime
());
updateEntity
.
setGoOffDateTime
(
recordErrorEntity
.
getGoOffDateTime
());
updateEntity
.
setProcessStatus
(
entity
.
getProcessStatus
());
updateEntity
.
setProcessStatus
(
entity
.
getProcessStatus
());
updateEntity
.
setGoOffDateTime
(
null
);
updateEntity
.
setProcessResult
(
entity
.
getProcessResult
());
updateEntity
.
setProcessResult
(
entity
.
getProcessResult
());
updateEntity
.
setErrorStatus
(
entity
.
getErrorStatus
());
updateEntity
.
setErrorStatus
(
entity
.
getErrorStatus
());
updateEntity
.
setOpertor
(
context
.
getUser
().
getRealName
());
updateEntity
.
setOpertor
(
context
.
getUser
().
getRealName
());
...
...
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