diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java index 27eb89f4b..fcfa1a4e4 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java @@ -7,6 +7,7 @@ import com.engine.salary.util.valid.DataCheck; import lombok.*; import java.util.Collection; +import java.util.List; /** * 薪资核算人员列表查询条件 @@ -33,11 +34,13 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam { //个税扣缴义务人") private Long taxAgentId; + //分部 + private List subcompanyIds; + //部门") private Collection departmentIds; - //岗位") private Collection positionIds; diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java index cd8ea51b6..dd49ccb6c 100644 --- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java +++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctResultQueryParam.java @@ -35,6 +35,9 @@ public class SalaryAcctResultQueryParam extends BaseQueryParam { //个税扣缴义务人 private Long taxAgentId; + //分部 + private Collection subcompanyIds; + //部门 private Collection departmentIds; diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java index 599a48d9d..268f31fde 100644 --- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java +++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java @@ -32,6 +32,9 @@ public class SalaryArchiveQueryParam extends BaseQueryParam { //个税扣缴义务人id private Long taxAgentId; + //分部id + private List subcompanyIds; + //部门id private List departmentIds; diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index 4b7f0c8a4..5381fd7b2 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -118,6 +118,13 @@ AND e.lastname like CONCAT('%',#{param.username},'%') + + + AND c.id IN + + #{subcompanyId} + + AND d.id IN @@ -169,6 +176,12 @@ AND e.lastname like '%'||#{param.username}||'%' + + AND c.id IN + + #{subcompanyId} + + AND d.id IN @@ -220,6 +233,12 @@ AND e.lastname like '%'+#{param.username}+'%' + + AND c.id IN + + #{subcompanyId} + + AND d.id IN diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml index 060e48e56..21d33debf 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml @@ -497,6 +497,7 @@ AND tax_agent_id = #{param.taxAgentId} @@ -507,6 +508,13 @@ AND em.lastname LIKE '%'||#{param.employeeName}||'%' + -- 分部 + + AND em.subcompanyid1 IN + + #{subcompanyId} + + AND em.departmentid IN @@ -552,6 +560,7 @@ AND tax_agent_id = #{param.taxAgentId} @@ -562,6 +571,13 @@ AND em.lastname LIKE '%'+#{param.employeeName}+'%' + -- 分部 + + AND em.subcompanyid1 IN + + #{subcompanyId} + + AND em.departmentid IN @@ -719,6 +735,7 @@ AND tax_agent_id = #{param.taxAgentId} @@ -729,6 +746,14 @@ AND em.lastname LIKE CONCAT('%',#{param.employeeName},'%') + -- 分部 + + AND em.subcompanyid1 IN + + #{subcompanyId} + + + -- 部门 AND em.departmentid IN diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 5fcae6a5a..c4753247c 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -131,6 +131,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe return pageInfo; } + // 获取作为管理员的所有个税扣缴义务人列表 Collection taxAgentPOS = getTaxAgentService(user).listAllTaxAgentsAsAdmin(currentEmployeeId); Set taxAgentIds = SalaryEntityUtil.properties(taxAgentPOS, TaxAgentPO::getId);