Commit 378347ca authored by 赵啸非's avatar 赵啸非

修正钉钉并发新增更新问题

parent caf9b76a
...@@ -83,6 +83,10 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -83,6 +83,10 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
@Override @Override
public AttendanceLeaveRecordEntity doUpdateRecord(String processInstanceId, AttendanceLeaveRecordEntity leaveRecordEntity) throws Exception { public AttendanceLeaveRecordEntity doUpdateRecord(String processInstanceId, AttendanceLeaveRecordEntity leaveRecordEntity) throws Exception {
if (leaveRecordEntity.getAuditResult() != 1) {
//临时解决并发问题,更新的都等待一秒后再执行
Thread.sleep(1000);
}
synchronized (this) { synchronized (this) {
AttendanceLeaveRecordEntity recordEntity = this.selectOne(new AttendanceLeaveRecordQuery().remark(processInstanceId)); AttendanceLeaveRecordEntity recordEntity = this.selectOne(new AttendanceLeaveRecordQuery().remark(processInstanceId));
if (ObjectUtils.isEmpty(recordEntity)) { if (ObjectUtils.isEmpty(recordEntity)) {
...@@ -127,7 +131,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At ...@@ -127,7 +131,7 @@ public class AttendanceLeaveRecordServiceImpl extends AbstractCRUDServiceImpl<At
AttendanceRecordHikQuery attendanceRecordHikQuery = new AttendanceRecordHikQuery(); AttendanceRecordHikQuery attendanceRecordHikQuery = new AttendanceRecordHikQuery();
attendanceRecordHikQuery.setStaffId(entity.getLeavePersonId()); 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) { if (in) {
//当前日期在请假期间,计算考勤结束时间为当前时间; //当前日期在请假期间,计算考勤结束时间为当前时间;
attendanceRecordHikQuery.setAttendanceDateStart(DateUtil.formatDate(entity.getStartTime())); attendanceRecordHikQuery.setAttendanceDateStart(DateUtil.formatDate(entity.getStartTime()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment