qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 添加是否补发参数

This commit is contained in:
fcli 2023-02-01 13:39:14 +08:00
parent 5851ea20be
commit 3f145e133b
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/salaryBill/param/SalaryBillSalaryGroupQueryParam.java
View File

@ -17,6 +17,8 @@ public class SalaryBillSalaryGroupQueryParam extends BaseQueryParam {
*/
private Long salarySobId;
private Boolean isReplenish;
/**
* 前端已有的分组id
*/

2
src/com/engine/salary/entity/salaryBill/param/SalaryBillSalaryItemQueryParam.java
View File

@ -16,5 +16,7 @@ public class SalaryBillSalaryItemQueryParam extends BaseQueryParam {
private Long groupId;
private Boolean isReplenish;
private List<String> existSalaryItemIds;
}

8
src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
View File

@ -392,8 +392,10 @@ public class SalaryTemplateWrapper extends Service {
* @return 单个分组下剩余的薪资项目
*/
public List<SalaryTemplateSalaryItemListDTO> getSalaryItemSetGrouped(SalaryBillSalaryItemQueryParam param) {
Boolean isReplenish = Optional.ofNullable(param.getIsReplenish())
.orElse(false);
List<SalaryTemplateSalaryItemSetListDTO> salaryItemSet
= getSalaryTemplateService(user).getSalaryItemSet(param.getSalarySobId(), false);
= getSalaryTemplateService(user).getSalaryItemSet(param.getSalarySobId(), isReplenish);
Long groupId = param.getGroupId();
return salaryItemSet.stream()
.filter(s -> Objects.equals(s.getGroupId(), groupId + ""))
@ -412,7 +414,9 @@ public class SalaryTemplateWrapper extends Service {
* @return 分组与下属
*/
public List<SalaryTemplateSalaryItemSetListDTO> getSalaryGroupSet(SalaryBillSalaryGroupQueryParam param) {
return getSalaryTemplateService(user).getSalaryItemSet(param.getSalarySobId(), false)
Boolean isReplenish = Optional.ofNullable(param.getIsReplenish())
.orElse(false);
return getSalaryTemplateService(user).getSalaryItemSet(param.getSalarySobId(), isReplenish)
.stream()
.filter(group -> !Optional.ofNullable(param.getExistSalaryGroupIds()).orElse(Collections.emptyList())
.contains(group.getGroupId())