diff --git a/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailListQueryParam.java b/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailListQueryParam.java index e330f2818..ae526ad40 100644 --- a/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailListQueryParam.java +++ b/src/com/engine/salary/entity/salaryBill/param/SalarySendDetailListQueryParam.java @@ -45,7 +45,12 @@ public class SalarySendDetailListQueryParam extends BaseQueryParam { private Long taxAgent; // 部门id") - private Long department; + private List departmentIds; + private String departmentIdStr; + + // 分部id + private List subCompanyIds; + private String subCompanyIdStr; // 岗位id") private Long position; diff --git a/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java b/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java index 70e56384d..981524986 100644 --- a/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java +++ b/src/com/engine/salary/entity/salaryBill/param/SalarySendInfoQueryParam.java @@ -47,6 +47,9 @@ public class SalarySendInfoQueryParam extends BaseQueryParam { // 部门id") private List departmentIds; + // 分部id + private List subCompanyIds; + // 岗位id") private List positionIds; @@ -77,6 +80,10 @@ public class SalarySendInfoQueryParam extends BaseQueryParam { // @JsonIgnore private List sendStatuss; + private String departmentIdStr; + + private String subCompanyIdStr; + public static String checkParam(SalarySendInfoQueryParam saveParam) { if (saveParam.getSalarySendId() == null) { throw new SalaryRunTimeException("工资单发放Id必传"); diff --git a/src/com/engine/salary/entity/siaccount/param/InsuranceAccountDetailParam.java b/src/com/engine/salary/entity/siaccount/param/InsuranceAccountDetailParam.java index 2492513cd..b8e56f090 100644 --- a/src/com/engine/salary/entity/siaccount/param/InsuranceAccountDetailParam.java +++ b/src/com/engine/salary/entity/siaccount/param/InsuranceAccountDetailParam.java @@ -42,4 +42,8 @@ public class InsuranceAccountDetailParam extends BaseQueryParam { private Long creator; private String workcode; + + private List departmentIds; + + private List subCompanyIds; } diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml index a7738491f..4870fdfde 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml @@ -381,6 +381,13 @@ and t1.send_status in (0, 2) + + + AND e.subcompanyid1 IN + + #{subCompanyId} + + @@ -411,6 +418,12 @@ and t1.send_status in (0, 2) + + + AND e.subcompanyid1 IN + + #{subCompanyId} + @@ -441,7 +454,12 @@ and t1.send_status in (0, 2) - + + AND e.subcompanyid1 IN + + #{subCompanyId} + + @@ -513,6 +531,12 @@ )) + + AND e.subcompanyid1 IN + + #{subCompanyId} + + diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index 82d0e6db3..55b55947e 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -203,6 +203,18 @@ #{taxAgent} + + AND e.departmentid IN + + #{departmentId} + + + + AND e.subcompanyid1 IN + + #{subCompanyId} + + @@ -232,6 +244,18 @@ #{taxAgent} + + AND e.departmentid IN + + #{departmentId} + + + + AND e.subcompanyid1 IN + + #{subCompanyId} + + @@ -261,6 +285,18 @@ #{taxAgent} + + AND e.departmentid IN + + #{departmentId} + + + + AND e.subcompanyid1 IN + + #{subCompanyId} + + @@ -291,6 +327,18 @@ #{taxAgent} + + AND e.department_id IN + + #{departmentId} + + + + AND e.subcompany_id IN + + #{subCompanyId} + + @@ -320,6 +368,18 @@ #{taxAgent} + + AND e.department_id IN + + #{departmentId} + + + + AND e.subcompany_id IN + + #{subCompanyId} + + @@ -349,6 +409,18 @@ #{taxAgent} + + AND e.department_id IN + + #{departmentId} + + + + AND e.subcompany_id IN + + #{subCompanyId} + + diff --git a/src/com/engine/salary/web/SalaryBillController.java b/src/com/engine/salary/web/SalaryBillController.java index 5468435dc..3b29aaea4 100644 --- a/src/com/engine/salary/web/SalaryBillController.java +++ b/src/com/engine/salary/web/SalaryBillController.java @@ -347,6 +347,12 @@ public class SalaryBillController { @Produces(MediaType.APPLICATION_JSON) public String infoList(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalarySendInfoQueryParam queryParam) { User user = HrmUserVarify.getUser(request, response); + if (StringUtils.isNotBlank(queryParam.getDepartmentIdStr())) { + queryParam.setDepartmentIds(Arrays.stream(StringUtils.split(queryParam.getDepartmentIdStr(), ",")).map(Long::valueOf).collect(Collectors.toList())); + } + if (StringUtils.isNotBlank(queryParam.getSubCompanyIdStr())) { + queryParam.setSubCompanyIds(Arrays.stream(StringUtils.split(queryParam.getSubCompanyIdStr(), ",")).map(Long::valueOf).collect(Collectors.toList())); + } return new ResponseResult>(user).run(getSalarySendWrapper(user)::infoList, queryParam); } @@ -487,7 +493,7 @@ public class SalaryBillController { // 处理入参复用方法 SalarySendDetailQueryParam detailQueryParam = SalarySendDetailQueryParam.builder() .userId(queryParam.getUserId()) - .departmentIds(SalaryEntityUtil.isNullOrEmpty(queryParam.getDepartment()) ? null : Collections.singletonList(queryParam.getDepartment())) + .departmentIds(CollectionUtils.isEmpty(queryParam.getDepartmentIds()) ? null : queryParam.getDepartmentIds()) .salarySendId(queryParam.getSalarySendId()) .mergeCountTax(queryParam.getMergeCountTax()) .positionIds(SalaryEntityUtil.isNullOrEmpty(queryParam.getPosition()) ? null : Collections.singletonList(queryParam.getPosition())) @@ -497,6 +503,12 @@ public class SalaryBillController { detailQueryParam.setCurrent(queryParam.getCurrent()); detailQueryParam.setPageSize(queryParam.getPageSize()); + if (StringUtils.isNotBlank(queryParam.getSubCompanyIdStr())) { + detailQueryParam.setSubCompanyIds(Arrays.asList(StringUtils.split(queryParam.getSubCompanyIdStr(), ",")).stream().map(Long::new).collect(Collectors.toList())); + } + if (StringUtils.isNotBlank(queryParam.getDepartmentIdStr())) { + detailQueryParam.setDepartmentIds(Arrays.asList(StringUtils.split(queryParam.getDepartmentIdStr(), ",")).stream().map(Long::new).collect(Collectors.toList())); + } return new ResponseResult>(user).run(getSalarySendWrapper(user)::detailList, detailQueryParam); }