From 174838382a7f73266bc1f285db2bcd9c547837f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Sat, 14 Sep 2024 10:52:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=89=A3=E7=BC=B4=E4=B9=89?= =?UTF-8?q?=E5=8A=A1=E4=BA=BA=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/enums/auth/DataTargetTypeEnum.java | 57 ++++++++++++------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/src/com/engine/salary/enums/auth/DataTargetTypeEnum.java b/src/com/engine/salary/enums/auth/DataTargetTypeEnum.java index dc9b76e56..25f850efb 100644 --- a/src/com/engine/salary/enums/auth/DataTargetTypeEnum.java +++ b/src/com/engine/salary/enums/auth/DataTargetTypeEnum.java @@ -3,10 +3,14 @@ package com.engine.salary.enums.auth; import com.engine.common.service.HrmCommonService; import com.engine.common.service.impl.HrmCommonServiceImpl; import com.engine.salary.entity.datacollection.DataCollectionEmployee; +import com.engine.salary.entity.taxagent.po.TaxAgentEmpPO; import com.engine.salary.enums.BaseEnum; +import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum; import com.engine.salary.exception.SalaryRunTimeException; import com.engine.salary.service.impl.SalaryEmployeeServiceImpl; +import com.engine.salary.service.impl.TaxAgentEmpServiceImpl; import com.engine.salary.util.SalaryEntityUtil; +import com.google.common.collect.Lists; import weaver.conn.RecordSet; import java.util.*; @@ -77,27 +81,27 @@ public enum DataTargetTypeEnum implements BaseEnum { return memberList; } }, - ALL(7, "所有人", 87626) { - @Override - public Set getEmpIds(String target, Object... param) { - Set memberList = new HashSet<>(); - RecordSet rs = new RecordSet(); - if (rs.execute("select id from hrmresource where status not in (7) and (accounttype is null or accounttype = 0) ")) { - while (rs.next()) { - memberList.add(Long.parseLong(rs.getString("id"))); - } - } - return memberList; - } - }, - LOGIN_PERSON(8, "登录人", 87626) { - //参数1,登录人信息 - @Override - public Set getEmpIds(String target, Object... param) { - LoginPersonTargetTypeEnum loginPersonTargetTypeEnum = LoginPersonTargetTypeEnum.parseByValue(Integer.parseInt(target)); - return loginPersonTargetTypeEnum.getEmpIds((DataCollectionEmployee) param[0]); - } - }, +// ALL(7, "所有人", 87626) { +// @Override +// public Set getEmpIds(String target, Object... param) { +// Set memberList = new HashSet<>(); +// RecordSet rs = new RecordSet(); +// if (rs.execute("select id from hrmresource where status not in (7) and (accounttype is null or accounttype = 0) ")) { +// while (rs.next()) { +// memberList.add(Long.parseLong(rs.getString("id"))); +// } +// } +// return memberList; +// } +// }, +// LOGIN_PERSON(8, "登录人", 87626) { +// //参数1,登录人信息 +// @Override +// public Set getEmpIds(String target, Object... param) { +// LoginPersonTargetTypeEnum loginPersonTargetTypeEnum = LoginPersonTargetTypeEnum.parseByValue(Integer.parseInt(target)); +// return loginPersonTargetTypeEnum.getEmpIds((DataCollectionEmployee) param[0]); +// } +// }, SOB(9, "账套", 87626) { @Override public Set getEmpIds(String target, Object... param) { @@ -106,7 +110,16 @@ public enum DataTargetTypeEnum implements BaseEnum { return SalaryEntityUtil.properties(employeeList, DataCollectionEmployee::getEmployeeId); } }, - SQL(10, "sql", 87626) { + TAX(10, "扣缴义务人", 87626) { + @Override + public Set getEmpIds(String target, Object... param) { + TaxAgentEmpServiceImpl taxAgentEmpServiceImpl = new TaxAgentEmpServiceImpl(); + List taxIds = Lists.newArrayList(Long.valueOf(target)); + List taxAgentEmpPOS = taxAgentEmpServiceImpl.listByTaxAgentIds(taxIds, UseEmployeeTypeEnum.ORG); + return SalaryEntityUtil.properties(taxAgentEmpPOS, TaxAgentEmpPO::getEmployeeId); + } + }, + SQL(11, "SQL", 87626) { @Override public Set getEmpIds(String target, Object... param) { //参数1,登录人信息