From 37a73b94dfcebbfc3fbf002529216da5101f8c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 1 Jun 2022 17:45:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datacollection/DataCollectionEmployee.java | 3 +++ .../mapper/datacollection/EmployMapper.java | 2 +- .../salary/mapper/datacollection/EmployMapper.xml | 15 +++++++-------- .../service/impl/SalaryArchiveServiceImpl.java | 10 +++++++--- .../impl/TaxAgentManageRangeServiceImpl.java | 4 ++-- 5 files changed, 20 insertions(+), 14 deletions(-) diff --git a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java index 7e74d2114..6f85d1e4f 100644 --- a/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java +++ b/src/com/engine/salary/entity/datacollection/DataCollectionEmployee.java @@ -39,6 +39,9 @@ public class DataCollectionEmployee { @SalaryFormulaVar(defaultLabel = "部门ID", labelId = 86185, dataType = "string") private Long departmentId; + private String subcompanyName; + private Long subcompanyid; + //岗位 @SalaryFormulaVar(defaultLabel = "岗位", labelId = 90633, dataType = "string") private String jobtitleName; diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.java b/src/com/engine/salary/mapper/datacollection/EmployMapper.java index 9c6c53db2..56413387d 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.java +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.java @@ -38,7 +38,7 @@ public interface EmployMapper { DataCollectionEmployee getEmployeeById(Long employeeId); - List listAll(); + List listAllFields(); List listPositionInfo(@Param("collection") List ids); diff --git a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml index 2abd74fb2..2c4733661 100644 --- a/src/com/engine/salary/mapper/datacollection/EmployMapper.xml +++ b/src/com/engine/salary/mapper/datacollection/EmployMapper.xml @@ -5,7 +5,8 @@ - select e.id as employeeId, e.lastname as username, e.status as status, e.workcode as workcode, e.certificatenum as idNo, + e.companystartdate as companystartdate, + e.mobile as mobile, + e.subcompanyid1 as subcompanyid, d.departmentname as departmentName, d.id as departmentId, c.jobtitlename as jobtitleName, - c.id as jobtitleId, - e.companystartdate as companystartdate, - e.mobile as mobile, - b.dismissdate as dismissdate + c.id as jobtitleId from hrmresource e left join hrmdepartment d on e.departmentid = d.id left join hrmjobtitles c on e.jobtitle = c.id - left join bill_hrmdismiss b on e.id = b.resource_n where e.status not in (7) - AND e.id = #{id} diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index a7a6b2865..204ccf7a6 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -95,15 +95,20 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe long currentEmployeeId = user.getUID(); Boolean needAuth = getTaxAgentService(user).isNeedAuth(currentEmployeeId); - if(needAuth){ + if (needAuth) { //获取管理的人员范围 List taxAgentEmployeeDTOS = getTaxAgentService(user).listTaxAgentAndEmployee(currentEmployeeId); Set employeeId = SalaryEntityUtil.properties(taxAgentEmployeeDTOS, TaxAgentEmployeeDTO::getEmployeeId); //获取所有薪资档案 List list = getSalaryArchiveMapper().list(queryParam); + List finalAllArchive = list.stream().filter(dto -> employeeId.contains(dto.getEmployeeId())).collect(Collectors.toList()); - }else { + PageInfo pageInfo = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), SalaryArchiveListDTO.class); + pageInfo.setTotal(finalAllArchive.size()); + pageInfo.setList(SalaryPageUtil.subList(queryParam.getCurrent(), queryParam.getPageSize(), finalAllArchive)); + + } else { SalaryPageUtil.start(queryParam.getCurrent(), queryParam.getPageSize()); List list = getSalaryArchiveMapper().list(queryParam); PageInfo pageInfo = new PageInfo(list, SalaryArchiveListDTO.class); @@ -111,7 +116,6 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe } - return salaryArchiveMapper.listPage(queryParam); } diff --git a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java index 4048e0e95..afb073e51 100644 --- a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java @@ -205,7 +205,7 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM if (CollectionUtils.isEmpty(taxAgentManageRanges)) { return Collections.emptyList(); } - List salaryEmployees = getEmployMapper().listAll(); + List salaryEmployees = getEmployMapper().listAllFields(); List salaryEmployeeList = Lists.newArrayList(); for (TaxAgentManageRangePO manageRange : taxAgentManageRanges) { salaryEmployeeList.addAll(salaryEmployees.stream() @@ -231,7 +231,7 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM return true; } if (Objects.equals(manageRange.getTargetType(), TargetTypeEnum.SUBCOMPANY.getValue()) - && Objects.equals(manageRange.getTargetId(), salaryEmployee.getDepartmentId())) { + && Objects.equals(manageRange.getTargetId(), salaryEmployee.getSubcompanyid())) { return true; } if (Objects.equals(manageRange.getTargetType(), TargetTypeEnum.POSITION.getValue())