From 6c2c96175ec74e6acac408df1968868e266934bf Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Wed, 23 Apr 2025 09:20:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E7=B2=BE=E5=8D=8E=E5=B7=A5?= =?UTF-8?q?=E8=B5=84=E5=8D=95=E9=9A=90=E8=97=8F=E7=A6=BB=E8=81=8C=E8=B4=A6?= =?UTF-8?q?=E5=A5=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/wrapper/SalarySendWrapper.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/com/engine/salary/wrapper/SalarySendWrapper.java b/src/com/engine/salary/wrapper/SalarySendWrapper.java index 0fccfecd0..cce4f5e1e 100644 --- a/src/com/engine/salary/wrapper/SalarySendWrapper.java +++ b/src/com/engine/salary/wrapper/SalarySendWrapper.java @@ -1,5 +1,6 @@ package com.engine.salary.wrapper; +import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; @@ -45,6 +46,7 @@ import org.apache.commons.lang3.math.NumberUtils; import org.apache.ibatis.session.SqlSession; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import weaver.conn.mybatis.MyBatisFactory; +import weaver.general.BaseBean; import weaver.hrm.User; import java.text.ParseException; @@ -137,6 +139,14 @@ public class SalarySendWrapper extends Service implements SalarySendWrapperProxy } }); + // 过滤离职账套的工资单 + BaseBean baseBean = new BaseBean(); + List resignationSobIds = Arrays.asList(baseBean.getPropValue("nbjhSalary", "dimissionSobIds").split(",")) + .stream() + .filter(NumberUtil::isNumber) + .map(Long::valueOf).collect(Collectors.toList()); + list = list.stream().filter(e -> !resignationSobIds.contains(e.getSalarySobId())).collect(Collectors.toList()); + PageInfo pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), list, SalarySendListDTO.class); List pageList = pageInfo.getList();