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
77df15c6
Commit
77df15c6
authored
Dec 14, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改假期重复提交的问题
parent
91b441ba
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
13 deletions
+16
-13
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java
.../module/attendance/dingmsg/api/DingMessageController.java
+1
-1
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceLeaveRecordServiceImpl.java
...ndance/service/impl/AttendanceLeaveRecordServiceImpl.java
+15
-12
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java
View file @
77df15c6
...
@@ -96,7 +96,7 @@ public class DingMessageController {
...
@@ -96,7 +96,7 @@ public class DingMessageController {
*/
*/
@PostMapping
(
"/dingtalk/getOaMeassge"
)
@PostMapping
(
"/dingtalk/getOaMeassge"
)
@UnAuth
@UnAuth
public
Map
<
String
,
String
>
getOaMessage
(
@RequestParam
(
value
=
"msg_signature"
,
required
=
false
)
String
msg_signature
,
public
synchronized
Map
<
String
,
String
>
getOaMessage
(
@RequestParam
(
value
=
"msg_signature"
,
required
=
false
)
String
msg_signature
,
@RequestParam
(
value
=
"timestamp"
,
required
=
false
)
String
timeStamp
,
@RequestParam
(
value
=
"timestamp"
,
required
=
false
)
String
timeStamp
,
@RequestParam
(
value
=
"nonce"
,
required
=
false
)
String
nonce
,
@RequestParam
(
value
=
"nonce"
,
required
=
false
)
String
nonce
,
@RequestBody
(
required
=
false
)
JSONObject
json
)
{
@RequestBody
(
required
=
false
)
JSONObject
json
)
{
...
...
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceLeaveRecordServiceImpl.java
View file @
77df15c6
...
@@ -49,20 +49,23 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
...
@@ -49,20 +49,23 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
}
}
@Override
@Override
public
synchronized
AttendanceLeaveRecordEntity
doUpdateRecord
(
String
processInstanceId
,
AttendanceLeaveRecordEntity
leaveRecordEntity
)
throws
Exception
{
public
AttendanceLeaveRecordEntity
doUpdateRecord
(
String
processInstanceId
,
AttendanceLeaveRecordEntity
leaveRecordEntity
)
throws
Exception
{
AttendanceLeaveRecordEntity
recordEntity
=
this
.
selectOne
(
new
AttendanceLeaveRecordQuery
().
remark
(
processInstanceId
));
synchronized
(
this
)
{
if
(
ObjectUtils
.
isEmpty
(
recordEntity
))
{
AttendanceLeaveRecordEntity
recordEntity
=
this
.
selectOne
(
new
AttendanceLeaveRecordQuery
().
remark
(
processInstanceId
));
leaveRecordEntity
.
setCreateTime
(
new
Date
());
if
(
ObjectUtils
.
isEmpty
(
recordEntity
))
{
leaveRecordEntity
.
setCreateUserId
(
1L
);
leaveRecordEntity
.
setCreateTime
(
new
Date
());
this
.
save
(
leaveRecordEntity
);
leaveRecordEntity
.
setCreateUserId
(
1L
);
}
else
{
this
.
save
(
leaveRecordEntity
);
leaveRecordEntity
.
setId
(
recordEntity
.
getId
());
}
else
{
leaveRecordEntity
.
setId
(
recordEntity
.
getId
());
leaveRecordEntity
.
setUpdateUserId
(
1L
);
leaveRecordEntity
.
setUpdateUserId
(
1L
);
leaveRecordEntity
.
setUpdateTime
(
new
Date
());
leaveRecordEntity
.
setUpdateTime
(
new
Date
());
this
.
update
(
leaveRecordEntity
);
this
.
update
(
leaveRecordEntity
);
}
return
leaveRecordEntity
;
}
}
return
leaveRecordEntity
;
}
}
}
}
\ No newline at end of file
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