From a340f1aaaffefc7069551f404e8abf99379abfeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 3 Aug 2022 17:02:03 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97?= =?UTF-8?q?=E6=97=B6=E5=8F=96=E8=B4=A6=E5=A5=97=E4=B8=8B=E7=9A=84=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E8=8C=83=E5=9B=B4=EF=BC=8C=E4=B8=94=E8=BF=99=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E9=9C=80=E8=A6=81=E5=86=8D=E8=B4=A6=E5=A5=97=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E7=9A=84=E6=89=A3=E7=BC=B4=E4=B9=89=E5=8A=A1=E4=BA=BA?= =?UTF-8?q?=E4=B8=8B=E7=94=B1=E6=A1=A3=E6=A1=88=EF=BC=8C=E4=B8=94=E8=B5=B7?= =?UTF-8?q?=E5=A7=8B=E5=8F=91=E8=96=AA=E5=92=8C=E6=9C=80=E5=90=8E=E5=8F=91?= =?UTF-8?q?=E8=96=AA=E6=97=A5=E6=9C=9F=E5=9C=A8=E8=BF=99=E4=B8=AA=E8=96=AA?= =?UTF-8?q?=E8=B5=84=E5=91=A8=E6=9C=9F=E5=86=85=202=E3=80=81=E7=A6=8F?= =?UTF-8?q?=E5=88=A9=E6=A0=B8=E7=AE=97=E7=9A=84=E8=8C=83=E5=9B=B4=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=9C=A8=E6=89=A3=E7=BC=B4=E4=B9=89=E5=8A=A1=E4=BA=BA?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E4=B8=94=E4=B8=89=E4=B8=AA=E8=B5=B7=E5=A7=8B?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=A5=E6=9C=9F=E5=9C=A8=E6=A0=B8=E7=AE=97?= =?UTF-8?q?=E5=91=A8=E6=9C=9F=E5=86=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/biz/SIArchivesBiz.java | 6 ++++-- .../entity/siarchives/param/InsuranceArchivesListParam.java | 4 +++- .../engine/salary/service/impl/SIArchivesServiceImpl.java | 2 ++ .../salary/service/impl/SalaryAcctEmployeeServiceImpl.java | 6 +++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/com/engine/salary/biz/SIArchivesBiz.java b/src/com/engine/salary/biz/SIArchivesBiz.java index f77380db8..89d8a1216 100644 --- a/src/com/engine/salary/biz/SIArchivesBiz.java +++ b/src/com/engine/salary/biz/SIArchivesBiz.java @@ -660,6 +660,7 @@ public class SIArchivesBiz { request.setNeedAuth(param.getNeedAuth()); request.setTaxAgentEmployeeIds(param.getTaxAgentEmployeeIds()); + request.setTaxAgentIds(param.getTaxAgentIds()); Integer current = param.getCurrent() == null ? 1 : param.getCurrent(); Integer pageSize = param.getPageSize() == null ? 10 : param.getPageSize(); @@ -705,10 +706,11 @@ public class SIArchivesBiz { PageInfo pageInfo = new PageInfo<>(InsuranceArchivesEmployeePO.class); if (needAuth) { Collection taxAgentEmployeeIds = param.getTaxAgentEmployeeIds(); + Collection taxAgentIds = param.getTaxAgentIds(); page = socialSchemeMapper.queryEmployeeList(param); page = page.stream().filter(f -> - // 作为管理员 - taxAgentEmployeeIds.contains(f.getEmployeeId()) +// taxAgentEmployeeIds.contains(f.getEmployeeId())|| + taxAgentIds.contains(f.getPaymentOrganization()) ).collect(Collectors.toList()); // 填充总数和当页数据 // 分页参数 diff --git a/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java b/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java index 1fa4690fd..90730235c 100644 --- a/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java +++ b/src/com/engine/salary/entity/siarchives/param/InsuranceArchivesListParam.java @@ -97,6 +97,8 @@ public class InsuranceArchivesListParam extends BaseQueryParam { //分权 private Boolean needAuth; - //个税扣缴义务人 + //个税扣缴义务人下人员 private Collection taxAgentEmployeeIds; + //个税扣缴义务人 + private Collection taxAgentIds; } diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java index a8d2c0fe1..77edbaff7 100644 --- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java @@ -95,7 +95,9 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService if (needAuth) { List taxAgentEmployeeDTOS = getTaxAgentService(user).listTaxAgentAndEmployee(currentEmployeeId); Set employeeIds = SalaryEntityUtil.properties(taxAgentEmployeeDTOS, TaxAgentEmployeeDTO::getEmployeeId); + Set taxAgentIds = SalaryEntityUtil.properties(taxAgentEmployeeDTOS, TaxAgentEmployeeDTO::getTaxAgentId); param.setTaxAgentEmployeeIds(employeeIds); + param.setTaxAgentIds(taxAgentIds); } Map apidatas = new HashMap<>(16); diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java index f996e38aa..b23e2cfe2 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java @@ -407,9 +407,9 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct //查询账套对应的扣缴义务人 SalarySobPO salarySobPO = getSalarySobService(user).getById(salaryAcctRecordPO.getSalarySobId()); Long taxAgentId = salarySobPO.getTaxAgentId(); - //过滤扣税扣缴义务人不包含的人员 - Collection employeeIdsInTaxAgent = getTaxAgentService(user).listEmployeeIdsInTaxAgent(taxAgentId); - salaryEmployees = salaryEmployees.stream().filter(salaryEmployee -> employeeIdsInTaxAgent.contains(salaryEmployee.getEmployeeId())).collect(Collectors.toList()); +// //过滤扣税扣缴义务人不包含的人员 +// Collection employeeIdsInTaxAgent = getTaxAgentService(user).listEmployeeIdsInTaxAgent(taxAgentId); +// salaryEmployees = salaryEmployees.stream().filter(salaryEmployee -> employeeIdsInTaxAgent.contains(salaryEmployee.getEmployeeId())).collect(Collectors.toList()); // 查询薪资档案，获取人员的个税扣缴义务人 Set employeeIds = SalaryEntityUtil.properties(salaryEmployees, DataCollectionEmployee::getEmployeeId);