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 2025-02-28 10:46:31 +08:00
parent 74e439eb15
commit 309b9804b4
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-crm/yudao-module-crm-biz/src/main/resources/mapper/crmcontract/CrmContractMapper.xml
View File

@ -98,7 +98,7 @@
<where> <where>
a.deleted = 0 a.deleted = 0
and b.deleted = 0 and b.deleted = 0
<if test="userIds != null and userIds.length > 0"> <if test="userIds != null and userIds.size() > 0">
AND a.owner_user_id in AND a.owner_user_id in
<foreach collection="userIds" item="id" index="index" open="(" close=")" separator=","> <foreach collection="userIds" item="id" index="index" open="(" close=")" separator=",">
#{id} #{id}

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

@ -281,9 +281,11 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService {
String year = String.valueOf(now.getYear()); String year = String.valueOf(now.getYear());
newHolidayUserDOList.forEach( newHolidayUserDOList.forEach(
a -> { a -> {
newHolidayUserEmploymentRecordDOList.add(new HolidayUserEmploymentRecordDO().setUserId(a.getUserId()) if (BigDecimal.ZERO.compareTo(a.getHolidayBalance()) > 0) {
.setHolidaySettingId(holidaySetting.getId()) newHolidayUserEmploymentRecordDOList.add(new HolidayUserEmploymentRecordDO().setUserId(a.getUserId())
.setYearNum(year)); .setHolidaySettingId(holidaySetting.getId())
.setYearNum(year));
}
} }
); );
if (CollUtil.isNotEmpty(newHolidayUserEmploymentRecordDOList)) { if (CollUtil.isNotEmpty(newHolidayUserEmploymentRecordDOList)) {
@ -300,6 +302,7 @@ public class HolidayUserRecordServiceImpl implements HolidayUserRecordService {
List<AdminUserDO> users = this.getUsersByRange(holidaySetting, holidaySettingRangeDOS); List<AdminUserDO> users = this.getUsersByRange(holidaySetting, holidaySettingRangeDOS);
// -- 计算获取每个人的假期额度 // -- 计算获取每个人的假期额度
Map<Long, BigDecimal> userQuotaMap = this.getQuotaMap(users, holidayBalanceSettingDO, holidayWorkingAgeDOS); Map<Long, BigDecimal> userQuotaMap = this.getQuotaMap(users, holidayBalanceSettingDO, holidayWorkingAgeDOS);
log.info("计算获取每个人的假期额度 userQuotaMap:{}", userQuotaMap);
// -- 获取用户的假期表 // -- 获取用户的假期表
List<Long> userIds = users.stream().map(AdminUserDO::getId).collect(Collectors.toList()); List<Long> userIds = users.stream().map(AdminUserDO::getId).collect(Collectors.toList());
Map<Long, AdminUserDO> userMap = users.stream().collect(Collectors.toMap(AdminUserDO::getId, a -> a)); Map<Long, AdminUserDO> userMap = users.stream().collect(Collectors.toMap(AdminUserDO::getId, a -> a));