From e4e3fb4bec3efbfae74df5306a1774051fcc77c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 19 Nov 2024 19:34:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/push/dto/PushSettingDTO.java | 6 +++--- .../engine/salary/service/impl/PushServiceImpl.java | 13 ++++++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/com/engine/salary/entity/push/dto/PushSettingDTO.java b/src/com/engine/salary/entity/push/dto/PushSettingDTO.java index 68f0be9b5..114d6fa5b 100644 --- a/src/com/engine/salary/entity/push/dto/PushSettingDTO.java +++ b/src/com/engine/salary/entity/push/dto/PushSettingDTO.java @@ -2,6 +2,7 @@ package com.engine.salary.entity.push.dto; import com.engine.hrmelog.annotation.ElogTransform; import com.engine.salary.annotation.TableTitle; +import com.engine.salary.entity.salarysob.po.SalarySobPO; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -36,9 +37,8 @@ public class PushSettingDTO { /** * 薪资帐套集合 */ - @TableTitle(title = "薪资帐套集合", key = "salarySobNames", dataIndex = "salarySobNames") - private List salarySobNames; - private List salarySobIds; + @TableTitle(title = "薪资帐套集合", key = "salarySobs", dataIndex = "salarySobs") + private List salarySobs; /** * 建模id diff --git a/src/com/engine/salary/service/impl/PushServiceImpl.java b/src/com/engine/salary/service/impl/PushServiceImpl.java index b100ec26e..3fc12a381 100644 --- a/src/com/engine/salary/service/impl/PushServiceImpl.java +++ b/src/com/engine/salary/service/impl/PushServiceImpl.java @@ -72,6 +72,10 @@ public class PushServiceImpl extends Service implements PushService { return ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user); } + private SalarySobService getSalarySobService(User user) { + return ServiceUtil.getService(SalarySobServiceImpl.class, user); + } + private SalaryAcctEmployeeService getSalaryAcctEmployeeService(User user) { return ServiceUtil.getService(SalaryAcctEmployeeServiceImpl.class, user); } @@ -84,16 +88,19 @@ public class PushServiceImpl extends Service implements PushService { public PageInfo settingList(PushSettingQueryParam param) { List pushSettingPOS = getPushSettingMapper().listAll(); + List salarySobPOS = getSalarySobService(user).listAll(); + Map sobPOMap = SalaryEntityUtil.convert2Map(salarySobPOS, SalarySobPO::getId); + List list = pushSettingPOS.stream() - .filter(po -> StrUtil.isNotBlank(param.getName()) && po.getName().contains(param.getName())).map( + .filter(po -> StrUtil.isBlank(param.getName()) || po.getName().contains(param.getName())).map( po -> PushSettingDTO.builder() .id(po.getId()) + .name(po.getName()) .tableName(po.getTableName()) .modeName(po.getModeName()) .modeId(po.getModeId()) .able(po.getAble()) - .salarySobIds(po.getSalarySobIds()) -// .salarySobNames(po.getSalarySobNames()) + .salarySobs(po.getSalarySobIds().stream().map(sobPOMap::get).collect(Collectors.toList())) .build()).collect(Collectors.toList()); return SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), list, PushSettingDTO.class); }