diff --git a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java index 41682ab45..e3f66c1d4 100644 --- a/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java +++ b/src/com/engine/salary/entity/salaryarchive/param/SalaryArchiveQueryParam.java @@ -30,10 +30,11 @@ public class SalaryArchiveQueryParam extends BaseQueryParam { //姓名 private String username; - private Long userId; + private Long employeeId; //个税扣缴义务人id private Long taxAgentId; + private String taxAgentName; //分部id private List subcompanyIds; diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml index 309b3a926..7382ac4b6 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.xml @@ -464,6 +464,9 @@ FROM hrsa_salary_archive t WHERE t.delete_type = 0 + + AND t.employee_id = #{param.employeeId} + AND t.employee_id IN diff --git a/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java b/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java index 51364ff38..cc10edaa7 100644 --- a/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java +++ b/src/com/engine/salary/process/salaryArchive/SalaryArchiveActionAPI.java @@ -2,6 +2,8 @@ package com.engine.salary.process.salaryArchive; import com.engine.common.util.ServiceUtil; import com.engine.salary.entity.salaryarchive.param.SalaryArchiveImportActionParam; +import com.engine.salary.entity.salaryarchive.param.SalaryArchiveQueryParam; +import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO; import com.engine.salary.util.ResponseResult; import com.engine.salary.wrapper.SalaryArchiveWrapper; import io.swagger.v3.oas.annotations.parameters.RequestBody; @@ -84,17 +86,13 @@ public class SalaryArchiveActionAPI { return new ResponseResult>(user).run(getSalaryArchiveWrapper(user)::adjustmentSalaryArchive, importData); } -// /** -// * 导入薪资档案附件上传前置校验 -// * @param importParam -// * @return -// */ -// @POST -// @Path("/checkImportSalaryArchiveUpload") -// @Produces(MediaType.APPLICATION_JSON) -// public String checkParam(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryArchiveImportHandleParam importParam) { -// User user = HrmUserVarify.getUser(request, response); -// return new ResponseResult>(user).run(getSalaryArchiveWrapper(user)::checkImportSalaryArchive, importParam); -// } + @POST + @Path("/salaryArchiveId") + @Produces(MediaType.APPLICATION_JSON) + public String adjustmentSalaryArchive(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SalaryArchiveQueryParam param) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult(user).run(getSalaryArchiveWrapper(user)::getSalaryArchiveInfo, param); + } + } diff --git a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java index d5c5799ed..7addd6ac8 100644 --- a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java @@ -626,8 +626,6 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService { } - - @Override public List listTaxAgentAndEmployeeTree() { List taxAgentManageRangeEmployeeList = Lists.newArrayList(); diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java index fa7ad2873..4be7ef8a7 100644 --- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java @@ -350,7 +350,7 @@ public class SalaryArchiveWrapper extends Service { // 获取所有可被引用的薪资项目 List salaryItemList = getSalaryArchiveItemService(user).getCanAdjustSalaryItems() - .stream().filter(item->getSalaryItemService(user).filterInRange(Collections.singleton(taxAgentId), item)) + .stream().filter(item -> getSalaryItemService(user).filterInRange(Collections.singleton(taxAgentId), item)) .collect(Collectors.toList()); Collection salaryItemIds = salaryItemList.stream().map(SalaryItemPO::getId).collect(Collectors.toList()); List salaryArchiveItemList = getSalaryArchiveService(user).getCurrentEffectiveItemList(Collections.singletonList(salaryArchiveId), salaryItemIds); @@ -548,4 +548,15 @@ public class SalaryArchiveWrapper extends Service { public Map handleRepeatData() { return getSalaryArchiveService(user).handleRepeatData(); } + + public SalaryArchivePO getSalaryArchiveInfo(SalaryArchiveQueryParam param) { + List list = getSalaryArchiveService(user).listSome(SalaryArchivePO.builder().employeeId(param.getEmployeeId()).taxAgentId(param.getTaxAgentId()).build()); + if (CollectionUtils.isEmpty(list)) { + throw new SalaryRunTimeException("薪资档案不存在!"); + } + if (list.size() > 1) { + throw new SalaryRunTimeException("存在多个薪资档案!"); + } + return list.get(0); + } }