ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

固定班次/排版班次编辑顺序 立即更新

Browse Source
This commit is contained in:
aikai 2024-06-11 14:31:48 +08:00
parent 83888cd77f
commit cecbe3fc74
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/fixed/AttendanceFixedServiceImpl.java
View File

@ -74,7 +74,7 @@ public class AttendanceFixedServiceImpl implements AttendanceFixedService, Punch
Map<Integer, AttendanceFixedDO> map = oldList.stream().collect(Collectors.toMap(AttendanceFixedDO::getWeekTime, a -> a)); Map<Integer, AttendanceFixedDO> map = oldList.stream().collect(Collectors.toMap(AttendanceFixedDO::getWeekTime, a -> a));
for (AttendanceFixedDO attendanceFixedDO : editList) { for (AttendanceFixedDO attendanceFixedDO : editList) {
AttendanceFixedDO item = map.get(attendanceFixedDO.getWeekTime()); AttendanceFixedDO item = map.get(attendanceFixedDO.getWeekTime());
boolean eqFlag = BeanUtil.isCommonFieldsEqual(attendanceFixedDO, item, "createTime", "updateTime", "creator", "updater"); boolean eqFlag = BeanUtil.isCommonFieldsEqual(attendanceFixedDO, item, "createTime", "updateTime", "creator", "updater", "deleted");
if (!eqFlag) { if (!eqFlag) {
groupId = attendanceGroupId; groupId = attendanceGroupId;
break; break;

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/groupshift/AttendanceGroupShiftServiceImpl.java
View File

@ -162,7 +162,7 @@ public class AttendanceGroupShiftServiceImpl implements AttendanceGroupShiftServ
groupShiftItemMapper.updateBatch(editList); groupShiftItemMapper.updateBatch(editList);
for (AttendanceGroupShiftItemDO attendanceGroupShiftItemDO : editList) { for (AttendanceGroupShiftItemDO attendanceGroupShiftItemDO : editList) {
AttendanceGroupShiftItemDO item = map.get(attendanceGroupShiftItemDO.getId()); AttendanceGroupShiftItemDO item = map.get(attendanceGroupShiftItemDO.getId());
boolean eqFlag = BeanUtil.isCommonFieldsEqual(attendanceGroupShiftItemDO, item, "createTime", "updateTime", "creator", "updater"); boolean eqFlag = BeanUtil.isCommonFieldsEqual(attendanceGroupShiftItemDO, item, "createTime", "updateTime", "creator", "updater", "deleted");
if (!eqFlag) { if (!eqFlag) {
flag = true; flag = true;
break; break;

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/punchrecord/AttendancePunchRecordServiceImpl.java
View File

@ -222,7 +222,7 @@ public class AttendancePunchRecordServiceImpl implements AttendancePunchRecordSe
attendancePunchRecordDO.setLatestPunchTime(shouldPunchTime.plusMinutes(attendanceOnTheDayDTO.getAfterPunchTime())); attendancePunchRecordDO.setLatestPunchTime(shouldPunchTime.plusMinutes(attendanceOnTheDayDTO.getAfterPunchTime()));
attendancePunchRecordDOList.add(attendancePunchRecordDO); attendancePunchRecordDOList.add(attendancePunchRecordDO);
} }
stringRedisTemplate.opsForHash().put(key + time, userId, JSONUtil.toJsonStr(attendanceOnTheDayDTOS)); stringRedisTemplate.opsForHash().put(key + time, userId.toString(), JSONUtil.toJsonStr(attendanceOnTheDayDTOS));
} }
//设置缓存 2天 //设置缓存 2天
stringRedisTemplate.expire(key + time, 2, TimeUnit.DAYS); stringRedisTemplate.expire(key + time, 2, TimeUnit.DAYS);

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/scheduling/AttendanceSchedulingServiceImpl.java
View File

@ -75,7 +75,7 @@ public class AttendanceSchedulingServiceImpl implements AttendanceSchedulingServ
Map<Integer, AttendanceSchedulingDO> map = oldList.stream().collect(Collectors.toMap(AttendanceSchedulingDO::getIndexDay, a -> a)); Map<Integer, AttendanceSchedulingDO> map = oldList.stream().collect(Collectors.toMap(AttendanceSchedulingDO::getIndexDay, a -> a));
for (AttendanceSchedulingDO attendanceSchedulingDO : editList) { for (AttendanceSchedulingDO attendanceSchedulingDO : editList) {
AttendanceSchedulingDO item = map.get(attendanceSchedulingDO.getIndexDay()); AttendanceSchedulingDO item = map.get(attendanceSchedulingDO.getIndexDay());
boolean eqFlag = BeanUtil.isCommonFieldsEqual(attendanceSchedulingDO, item, "createTime", "updateTime", "creator", "updater"); boolean eqFlag = BeanUtil.isCommonFieldsEqual(attendanceSchedulingDO, item, "createTime", "updateTime", "creator", "updater", "deleted");
if (!eqFlag) { if (!eqFlag) {
groupId = attendanceGroupId; groupId = attendanceGroupId;
break; break;