diff --git a/src/com/engine/salary/entity/salaryacct/param/wldDynamicSalaryReportQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/wldDynamicSalaryReportQueryParam.java index 0530aabc0..ebd1558d2 100644 --- a/src/com/engine/salary/entity/salaryacct/param/wldDynamicSalaryReportQueryParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/wldDynamicSalaryReportQueryParam.java @@ -5,6 +5,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * @ClassName wldDynamicSalaryReportQueryParam * @author Harryxzy @@ -18,4 +20,13 @@ public class wldDynamicSalaryReportQueryParam extends BaseQueryParam { boolean isExport; + List lbList; + + List bgddList; + + List gwmcList; + + List gwzjList; + + } diff --git a/src/com/engine/salary/service/SalaryAcctResultService.java b/src/com/engine/salary/service/SalaryAcctResultService.java index 1e562ee21..17c014ef0 100644 --- a/src/com/engine/salary/service/SalaryAcctResultService.java +++ b/src/com/engine/salary/service/SalaryAcctResultService.java @@ -239,4 +239,6 @@ public interface SalaryAcctResultService { XSSFWorkbook exportWdlDynamicSalaryReport(wldDynamicSalaryReportQueryParam param); Map importWdlDynamicSalaryReport(SalaryAcctImportParam param); + + List> wdlLbSelectList(); } diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 9833f68e3..833403305 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -1320,6 +1320,26 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe Map itemNameMap = SalaryEntityUtil.convert2Map(salaryItemList, SalaryItemPO::getId, SalaryItemPO::getName); // 获取所有工资结构信息 List wdlGzjgDTOList = listAllWdlGzjg(); + if (CollectionUtils.isNotEmpty(param.getLbList())) { + wdlGzjgDTOList = wdlGzjgDTOList.stream() + .filter(wdlGzjgDTO -> param.getLbList().contains(wdlGzjgDTO.getLb())) + .collect(Collectors.toList()); + } + if (CollectionUtils.isNotEmpty(param.getBgddList())) { + wdlGzjgDTOList = wdlGzjgDTOList.stream() + .filter(wdlGzjgDTO -> param.getBgddList().contains(wdlGzjgDTO.getBgdd())) + .collect(Collectors.toList()); + } + if (CollectionUtils.isNotEmpty(param.getGwmcList())) { + wdlGzjgDTOList = wdlGzjgDTOList.stream() + .filter(wdlGzjgDTO -> param.getGwmcList().contains(wdlGzjgDTO.getGwmc())) + .collect(Collectors.toList()); + } + if (CollectionUtils.isNotEmpty(param.getGwzjList())) { + wdlGzjgDTOList = wdlGzjgDTOList.stream() + .filter(wdlGzjgDTO -> param.getGwzjList().contains(wdlGzjgDTO.getGwzj())) + .collect(Collectors.toList()); + } PageInfo wdlGzjgDTOPageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), wdlGzjgDTOList); wdlGzjgDTOList = wdlGzjgDTOPageInfo.getList(); @@ -1395,6 +1415,25 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe return resultMap; } + @Override + public List> wdlLbSelectList() { + BaseBean baseBean = new BaseBean(); + RecordSet rs = new RecordSet(); + // 查询类别信息 + String lbFieldId = baseBean.getPropValue("wdlSalary", "bzgzbz_lb_field_id"); + rs.execute("select selectValue,selectname from workflow_selectitem where fieldid=" + lbFieldId); + List> resultList = new ArrayList<>(); + while (rs.next()) { + Map lbValueMap = new HashMap<>(); + Integer selectValue = rs.getInt("selectValue"); + String selectName = rs.getString("selectname"); + lbValueMap.put("id", selectValue); + lbValueMap.put("name", selectName); + resultList.add(lbValueMap); + } + return resultList; + } + private List listAllWdlGzjg() { RecordSet rs = new RecordSet(); List resultList = new ArrayList<>(); diff --git a/src/com/engine/salary/web/SalaryAcctController.java b/src/com/engine/salary/web/SalaryAcctController.java index 20745d20b..c4eed7f35 100644 --- a/src/com/engine/salary/web/SalaryAcctController.java +++ b/src/com/engine/salary/web/SalaryAcctController.java @@ -940,6 +940,16 @@ public class SalaryAcctController { } + //万德隆类别下拉框信息 + @GET + @Path("/wdl/lbSelectList") + @Produces(MediaType.APPLICATION_JSON) + public String wdlLbSelectList(@Context HttpServletRequest request, @Context HttpServletResponse response) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult>>(user).run(getSalaryAcctResultWrapper(user)::wdlLbSelectList); + } + + /** * 导出万德隆薪资动态表 */ diff --git a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java index 2e40584eb..de287b899 100644 --- a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java @@ -318,6 +318,10 @@ public class SalaryAcctResultWrapper extends Service implements SalaryAcctResult } } + public List> wdlLbSelectList() { + return getSalaryAcctResultService(user).wdlLbSelectList(); + } + /** * 薪资核算-校验 *