Commit 9018197b829083e5cdbe6bf3eb06d1dbeb696e8d
1 parent
ac814d59
feature(bug): 搜索调岗之前的门店，获取薪酬额外数据
搜索调岗之前的门店，获取薪酬额外数据
Showing
1 changed file
with
1 additions
and
0 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/calculator/salary/DynamicSalaryCalculator.java
| @@ -96,6 +96,7 @@ public class DynamicSalaryCalculator extends SalaryBaseCalculator { | @@ -96,6 +96,7 @@ public class DynamicSalaryCalculator extends SalaryBaseCalculator { | ||
| 96 | .eq(SalaryGroupUser::getUserId, pool.getUserId()) | 96 | .eq(SalaryGroupUser::getUserId, pool.getUserId()) |
| 97 | .ge(SalaryGroupUser::getDataDate, startTime) | 97 | .ge(SalaryGroupUser::getDataDate, startTime) |
| 98 | .le(SalaryGroupUser::getDataDate, date) | 98 | .le(SalaryGroupUser::getDataDate, date) |
| 99 | + .eq(SalaryGroupUser::getYn, Boolean.TRUE) | ||
| 99 | ); | 100 | ); |
| 100 | List<Long> shopIds = groupUsers.stream().map(SalaryGroupUser::getShopId).distinct().collect(Collectors.toList()); | 101 | List<Long> shopIds = groupUsers.stream().map(SalaryGroupUser::getShopId).distinct().collect(Collectors.toList()); |
| 101 | 102 |