From 3167aaab63de99c4f202b1c2f7beec55b1ecdc20 Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 20 Sep 2023 17:29:44 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E6=96=B9=E6=A1=88=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/sischeme/param/InsuranceSchemeParam.java | 6 ++++++ src/com/engine/salary/service/impl/SISchemeServiceImpl.java | 3 +++ 2 files changed, 9 insertions(+) diff --git a/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java b/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java index fd7deadb1..cdc4b29f4 100644 --- a/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java +++ b/src/com/engine/salary/entity/sischeme/param/InsuranceSchemeParam.java @@ -1,6 +1,7 @@ package com.engine.salary.entity.sischeme.param; import com.engine.salary.common.BaseQueryParam; +import com.engine.salary.enums.sicategory.PaymentTypeEnum; import com.engine.salary.enums.sicategory.WelfareTypeEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -24,6 +25,11 @@ public class InsuranceSchemeParam extends BaseQueryParam { private WelfareTypeEnum welfareTypeEnum; + /** + * 缴纳类型 + */ + private PaymentTypeEnum paymentTypeEnum; + /** * 方案名称 */ diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 44400f3c4..b4766b277 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -195,6 +195,9 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { public PageInfo list(InsuranceSchemeParam queryParam) { SalaryAssert.notNull(queryParam.getWelfareTypeEnum(), SalaryI18nUtil.getI18nLabel(84026, "参数错误")); queryParam.setWelfareType(queryParam.getWelfareTypeEnum().getValue()); + if (queryParam.getPaymentTypeEnum() != null) { + queryParam.setPaymentType(queryParam.getPaymentTypeEnum().getValue()); + } Long currentEmployeeId = (long) user.getUID(); List insuranceSchemePOS; Boolean needAuth = getTaxAgentService().isNeedAuth(currentEmployeeId);