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
378347ca
Commit
378347ca
authored
Feb 19, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修正钉钉并发新增更新问题
parent
caf9b76a
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/impl/AttendanceLeaveRecordServiceImpl.java
...ndance/service/impl/AttendanceLeaveRecordServiceImpl.java
+5
-1
No files found.
attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/service/impl/AttendanceLeaveRecordServiceImpl.java
View file @
378347ca
...
...
@@ -83,6 +83,10 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
@Override
public
AttendanceLeaveRecordEntity
doUpdateRecord
(
String
processInstanceId
,
AttendanceLeaveRecordEntity
leaveRecordEntity
)
throws
Exception
{
if
(
leaveRecordEntity
.
getAuditResult
()
!=
1
)
{
//临时解决并发问题,更新的都等待一秒后再执行
Thread
.
sleep
(
1000
);
}
synchronized
(
this
)
{
AttendanceLeaveRecordEntity
recordEntity
=
this
.
selectOne
(
new
AttendanceLeaveRecordQuery
().
remark
(
processInstanceId
));
if
(
ObjectUtils
.
isEmpty
(
recordEntity
))
{
...
...
@@ -127,7 +131,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
AttendanceRecordHikQuery
attendanceRecordHikQuery
=
new
AttendanceRecordHikQuery
();
attendanceRecordHikQuery
.
setStaffId
(
entity
.
getLeavePersonId
());
//判断请假的开始日期与结束日期
boolean
in
=
DateUtil
.
isIn
(
new
Date
(),
entity
.
getStartTime
(),
entity
.
getEndTime
());
boolean
in
=
DateUtil
.
isIn
(
new
Date
(),
entity
.
getStartTime
(),
entity
.
getEndTime
());
if
(
in
)
{
//当前日期在请假期间,计算考勤结束时间为当前时间;
attendanceRecordHikQuery
.
setAttendanceDateStart
(
DateUtil
.
formatDate
(
entity
.
getStartTime
()));
...
...
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