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-11-11 09:50:21 +08:00
parent 1532771980
commit 725f729740
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/holiday/holidayuserrecord/HolidayUserRecordServiceImpl.java
View File

@ -543,7 +543,8 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService {
if (holidayBalanceSettingDO.getType() == 1) {
for (AdminUserDO user : users) {
if (user.getEntryDate() == null) {
continue;
user.setEntryDate(user.getCreateTime());
// continue;
}
List<LocalDateTime> theDayOfEachMonthSoFar = LocalDateTimeUtils.getTheDayOfEachMonthSoFar(user.getEntryDate(), now, holidayBalanceSettingDO.getIssueTimeType());
Map<LocalDateTime, BigDecimal> map = theDayOfEachMonthSoFar.stream()
@ -556,7 +557,8 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService {
} else if (holidayBalanceSettingDO.getType() == 2) {
for (AdminUserDO user : users) {
if (user.getEntryDate() == null) {
continue;
user.setEntryDate(user.getCreateTime());
// continue;
}
List<LocalDateTime> theDayOfEachMonthSoFar;
if (holidayBalanceSettingDO.getIssueTimeType() == 1) {
@ -611,14 +613,16 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService {
if (holidayBalanceSettingDO.getType() == 1) {
for (AdminUserDO user : users) {
if (user.getEntryDate() == null) {
continue;
user.setEntryDate(user.getCreateTime());
// continue;
}
quotaMap.put(user.getId(), new BigDecimal(holidayBalanceSettingDO.getQuota().toString()));
}
} else if (holidayBalanceSettingDO.getType() == 2) {
for (AdminUserDO user : users) {
if (user.getEntryDate() == null) {
continue;
user.setEntryDate(user.getCreateTime());
// continue;
}
if (holidayBalanceSettingDO.getQuotaRule() == 1) {
// TODO: 2024/11/6 // -- actualWorkFlag 没有判断这个 - 暂时去掉