diff --git a/src/com/engine/salary/service/SICompensationService.java b/src/com/engine/salary/service/SICompensationService.java index 6dfe429f2..b79c29fc4 100644 --- a/src/com/engine/salary/service/SICompensationService.java +++ b/src/com/engine/salary/service/SICompensationService.java @@ -11,7 +11,7 @@ import java.util.Map; public interface SICompensationService { - PageInfo getEmployeeListToCompensation(HrmQueryParam param); + List getEmployeeListToCompensation(HrmQueryParam param); List> compensationCategoryType(Long id); diff --git a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java index 33cf6047d..7715b5d9b 100644 --- a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java +++ b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java @@ -85,7 +85,7 @@ public class SICompensationServiceImpl extends Service implements SICompensation * 可调差人员 */ @Override - public PageInfo getEmployeeListToCompensation(HrmQueryParam param) { + public List getEmployeeListToCompensation(HrmQueryParam param) { // 当前登录人员 Long currentEmployeeId = (long) user.getUID(); @@ -103,20 +103,40 @@ public class SICompensationServiceImpl extends Service implements SICompensation } - // 分页 - PageInfo page = new PageInfo<>(); - if (resultData.size() == 0) { - return page; - } - page.setTotal(resultData.size()); - - page.setList(SalaryPageUtil.subList(param.getPageNum(), param.getPageSize(), resultData)); - page.setPageSize(param.getPageSize()); - page.setPageNum(param.getPageNum()); - - - return page; + return resultData; } +// public PageInfo getEmployeeListToCompensation(HrmQueryParam param) { +// // 当前登录人员 +// Long currentEmployeeId = (long) user.getUID(); +// +// //查询账单月份+个税扣缴义务人下的社保福利正常缴纳人员列表 +// List normalDataList = getInsuranceAccountDetailMapper().queryNormalListByBillMonth(param.getBillMonth(), param.getPaymentOrganization()); +// List empIds = normalDataList.stream().map(InsuranceAccountDetailPO::getEmployeeId).collect(Collectors.toList()); +// +// List resultData = new ArrayList<>(); +// if (empIds.size() > 0) { +// List> partition = Lists.partition(empIds, 1000); +// partition.forEach(p -> { +// param.setIds(p); +// resultData.addAll(getEmployMapper().listHrmInfoByIdAndName(param)); +// }); +// +// } +// +// // 分页 +// PageInfo page = new PageInfo<>(); +// if (resultData.size() == 0) { +// return page; +// } +// page.setTotal(resultData.size()); +// +// page.setList(SalaryPageUtil.subList(param.getPageNum(), param.getPageSize(), resultData)); +// page.setPageSize(param.getPageSize()); +// page.setPageNum(param.getPageNum()); +// +// +// return page; +// } /** * 调差福利项 diff --git a/src/com/engine/salary/web/SIAccountController.java b/src/com/engine/salary/web/SIAccountController.java index 8b740d537..790c125f0 100644 --- a/src/com/engine/salary/web/SIAccountController.java +++ b/src/com/engine/salary/web/SIAccountController.java @@ -710,7 +710,7 @@ public class SIAccountController { public String getEmployeeListToCompensation(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody HrmQueryParam param) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult>(user).run(getSIAccountWrapper(user)::getEmployeeListToCompensation, param); + return new ResponseResult>(user).run(getSIAccountWrapper(user)::getEmployeeListToCompensation, param); } /** diff --git a/src/com/engine/salary/wrapper/SIAccountWrapper.java b/src/com/engine/salary/wrapper/SIAccountWrapper.java index cc886cb2f..3180d9979 100644 --- a/src/com/engine/salary/wrapper/SIAccountWrapper.java +++ b/src/com/engine/salary/wrapper/SIAccountWrapper.java @@ -63,7 +63,7 @@ public class SIAccountWrapper extends Service { /** * 可调差人员列表 */ - public PageInfo getEmployeeListToCompensation(HrmQueryParam hrmQueryParam) { + public List getEmployeeListToCompensation(HrmQueryParam hrmQueryParam) { return getSICompensationService(user).getEmployeeListToCompensation(hrmQueryParam); }