From 3f145e133b588c48221b2e4dd8929e7fb38fec18 Mon Sep 17 00:00:00 2001 From: fcli Date: Wed, 1 Feb 2023 13:39:14 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=A1=A5=E5=8F=91=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryBill/param/SalaryBillSalaryGroupQueryParam.java | 2 ++ .../salaryBill/param/SalaryBillSalaryItemQueryParam.java | 2 ++ src/com/engine/salary/wrapper/SalaryTemplateWrapper.java | 8 ++++++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/entity/salaryBill/param/SalaryBillSalaryGroupQueryParam.java b/src/com/engine/salary/entity/salaryBill/param/SalaryBillSalaryGroupQueryParam.java index c138e2f41..8bf974208 100644 --- a/src/com/engine/salary/entity/salaryBill/param/SalaryBillSalaryGroupQueryParam.java +++ b/src/com/engine/salary/entity/salaryBill/param/SalaryBillSalaryGroupQueryParam.java @@ -17,6 +17,8 @@ public class SalaryBillSalaryGroupQueryParam extends BaseQueryParam { */ private Long salarySobId; + private Boolean isReplenish; + /** * 前端已有的分组id */ diff --git a/src/com/engine/salary/entity/salaryBill/param/SalaryBillSalaryItemQueryParam.java b/src/com/engine/salary/entity/salaryBill/param/SalaryBillSalaryItemQueryParam.java index cf2441c44..ee0be17f7 100644 --- a/src/com/engine/salary/entity/salaryBill/param/SalaryBillSalaryItemQueryParam.java +++ b/src/com/engine/salary/entity/salaryBill/param/SalaryBillSalaryItemQueryParam.java @@ -16,5 +16,7 @@ public class SalaryBillSalaryItemQueryParam extends BaseQueryParam { private Long groupId; + private Boolean isReplenish; + private List existSalaryItemIds; } diff --git a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java index 8d5d5c51d..1c2f6d49f 100644 --- a/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryTemplateWrapper.java @@ -392,8 +392,10 @@ public class SalaryTemplateWrapper extends Service { * @return 单个分组下剩余的薪资项目 */ public List getSalaryItemSetGrouped(SalaryBillSalaryItemQueryParam param) { + Boolean isReplenish = Optional.ofNullable(param.getIsReplenish()) + .orElse(false); List 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 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())