diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 02da24b98..17a1afdd0 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -204,7 +204,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe * @return */ @NotNull - private List setSalaryArchiveStatus(Map> taxAgentEmployeesMap, List list) { + private List setSalaryArchiveStatus(Map> taxAgentEmployeesMap, Collection list) { list = list.stream().peek(dto -> { List taxAgentEmployees = taxAgentEmployeesMap.get(dto.getTaxAgentId()); Set employeeIds = SalaryEntityUtil.properties(taxAgentEmployees, TaxAgentManageRangeEmployeeDTO.TaxAgentEmployee::getEmployeeId); @@ -214,7 +214,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe dto.setArchiveStatus(SalaryArchiveStatusEnum.ARCHIVE.getValue()); } }).collect(Collectors.toList()); - return list; + return (List)list; } @Override @@ -379,6 +379,11 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe // 获取所有个税扣缴义务人 Collection taxAgentList = getTaxAgentService(user).listAll(); + //获取管理的人员范围 + List taxAgentEmployeeDTOS = getTaxAgentService(user).listTaxAgentAndEmployeeTree(employeeId); + Map> taxAgentEmployeesMap = SalaryEntityUtil.convert2Map(taxAgentEmployeeDTOS, TaxAgentManageRangeEmployeeDTO::getTaxAgentId, TaxAgentManageRangeEmployeeDTO::getEmployeeList); + + //排序配置 OrderRuleVO orderRule = getSalarySysConfService(user).orderRule(); queryParam.setOrderRule(orderRule); @@ -401,6 +406,9 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe //过滤档案状态 if (StringUtils.isNotBlank(queryParam.getArchiveStatus())) { + //设置档案状态 + salaryArchives = setSalaryArchiveStatus(taxAgentEmployeesMap, salaryArchives); + //过滤档案状态 salaryArchives = salaryArchives.stream().filter(dto -> StringUtils.equals(queryParam.getArchiveStatus(), dto.getArchiveStatus())).collect(Collectors.toList()); } } diff --git a/src/com/engine/salary/web/SalaryArchiveController.java b/src/com/engine/salary/web/SalaryArchiveController.java index 635775ebb..ec7b3522e 100644 --- a/src/com/engine/salary/web/SalaryArchiveController.java +++ b/src/com/engine/salary/web/SalaryArchiveController.java @@ -245,6 +245,10 @@ public class SalaryArchiveController { if (StringUtils.isNotBlank(hasData)) { param.setHasData(Boolean.valueOf(hasData)); } + String archiveStatus = request.getParameter("archiveStatus"); + if (StringUtils.isNotBlank(archiveStatus)) { + param.setArchiveStatus(archiveStatus); + } return param; }