qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

薪酬系统-福利台账，可调差人员列表功能取消分页逻辑

This commit is contained in:
sy 2022-12-05 15:42:49 +08:00
parent 014190f6d0
commit a04f4a915f
4 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/service/SICompensationService.java
View File

@ -11,7 +11,7 @@ import java.util.Map;
public interface SICompensationService { public interface SICompensationService {
PageInfo<HrmInfoDTO> getEmployeeListToCompensation(HrmQueryParam param); List<HrmInfoDTO> getEmployeeListToCompensation(HrmQueryParam param);
List<Map<String, String>> compensationCategoryType(Long id); List<Map<String, String>> compensationCategoryType(Long id);

48
src/com/engine/salary/service/impl/SICompensationServiceImpl.java
View File

@ -85,7 +85,7 @@ public class SICompensationServiceImpl extends Service implements SICompensation
* 可调差人员 * 可调差人员
*/ */
@Override @Override
public PageInfo<HrmInfoDTO> getEmployeeListToCompensation(HrmQueryParam param) { public List<HrmInfoDTO> getEmployeeListToCompensation(HrmQueryParam param) {
// 当前登录人员 // 当前登录人员
Long currentEmployeeId = (long) user.getUID(); Long currentEmployeeId = (long) user.getUID();
@ -103,20 +103,40 @@ public class SICompensationServiceImpl extends Service implements SICompensation
} }
// 分页 return resultData;
PageInfo<HrmInfoDTO> 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;
} }
// public PageInfo<HrmInfoDTO> getEmployeeListToCompensation(HrmQueryParam param) {
// // 当前登录人员
// Long currentEmployeeId = (long) user.getUID();
//
// //查询账单月份+个税扣缴义务人下的社保福利正常缴纳人员列表
// List<InsuranceAccountDetailPO> normalDataList = getInsuranceAccountDetailMapper().queryNormalListByBillMonth(param.getBillMonth(), param.getPaymentOrganization());
// List<Long> empIds = normalDataList.stream().map(InsuranceAccountDetailPO::getEmployeeId).collect(Collectors.toList());
//
// List<HrmInfoDTO> resultData = new ArrayList<>();
// if (empIds.size() > 0) {
// List<List<Long>> partition = Lists.partition(empIds, 1000);
// partition.forEach(p -> {
// param.setIds(p);
// resultData.addAll(getEmployMapper().listHrmInfoByIdAndName(param));
// });
//
// }
//
// // 分页
// PageInfo<HrmInfoDTO> 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;
// }
/** /**
* 调差福利项 * 调差福利项

2
src/com/engine/salary/web/SIAccountController.java
View File

@ -710,7 +710,7 @@ public class SIAccountController {
public String getEmployeeListToCompensation(@Context HttpServletRequest request, @Context HttpServletResponse response, public String getEmployeeListToCompensation(@Context HttpServletRequest request, @Context HttpServletResponse response,
@RequestBody HrmQueryParam param) { @RequestBody HrmQueryParam param) {
User user = HrmUserVarify.getUser(request, response); User user = HrmUserVarify.getUser(request, response);
return new ResponseResult<HrmQueryParam, PageInfo<HrmInfoDTO>>(user).run(getSIAccountWrapper(user)::getEmployeeListToCompensation, param); return new ResponseResult<HrmQueryParam, List<HrmInfoDTO>>(user).run(getSIAccountWrapper(user)::getEmployeeListToCompensation, param);
} }
/** /**

2
src/com/engine/salary/wrapper/SIAccountWrapper.java
View File

@ -63,7 +63,7 @@ public class SIAccountWrapper extends Service {
/** /**
* 可调差人员列表 * 可调差人员列表
*/ */
public PageInfo<HrmInfoDTO> getEmployeeListToCompensation(HrmQueryParam hrmQueryParam) { public List<HrmInfoDTO> getEmployeeListToCompensation(HrmQueryParam hrmQueryParam) {
return getSICompensationService(user).getEmployeeListToCompensation(hrmQueryParam); return getSICompensationService(user).getEmployeeListToCompensation(hrmQueryParam);
} }