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

2100bug修复

This commit is contained in:
Harryxzy 2025-04-16 11:24:58 +08:00
parent b2e82f7f83
commit 59cb927806
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ public interface SalaryAcctEmployeeService {
* @param ids 主键id
* @return
*/
List<SalaryAcctEmployeePO> listByIds(Collection<Long> ids);
List<SalaryAcctEmployeePO> listByIds(List<Long> ids);
/**
* 根据薪资核算记录id查询薪资核算人员

15
src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
View File

@ -16,8 +16,8 @@ import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveDataDTO;
import com.engine.salary.entity.salarysob.dto.SalarySobCycleDTO;
import com.engine.salary.entity.salarysob.po.SalarySobItemPO;
import com.engine.salary.entity.salarysob.param.SalarySobQueryParam;
import com.engine.salary.entity.salarysob.po.SalarySobItemPO;
import com.engine.salary.entity.salarysob.po.SalarySobPO;
import com.engine.salary.entity.taxagent.param.TaxAgentQueryParam;
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
@ -31,7 +31,6 @@ import com.engine.salary.mapper.salarysob.SobTaxLinkMapper;
import com.engine.salary.mapper.sys.SalarySysConfMapper;
import com.engine.salary.report.entity.param.SalaryStatisticsReportDataQueryParam;
import com.engine.salary.service.*;
import com.engine.salary.sys.constant.SalarySysConstant;
import com.engine.salary.service.auth.AuthService;
import com.engine.salary.service.auth.AuthServiceImpl;
import com.engine.salary.sys.constant.SalarySysConstant;
@ -148,8 +147,14 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
}
@Override
public List<SalaryAcctEmployeePO> listByIds(Collection<Long> ids) {
return getSalaryAcctEmployeeMapper().listSome(SalaryAcctEmployeePO.builder().ids(ids).build());
public List<SalaryAcctEmployeePO> listByIds(List<Long> ids) {
List<List<Long>> partition = Lists.partition(ids, 300);
List<SalaryAcctEmployeePO> resultList = new ArrayList<>();
partition.forEach(part -> {
resultList.addAll(getSalaryAcctEmployeeMapper().listSome(SalaryAcctEmployeePO.builder().ids(part).build()));
});
return resultList;
}
@Override
@ -833,7 +838,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
@Override
public void lockEmp(SalaryAcctResultUpdateLockStatusParam updateParam) {
List<SalaryAcctEmployeePO> salaryAcctEmployees = listByIds(updateParam.getAcctEmpIds());
List<SalaryAcctEmployeePO> salaryAcctEmployees = listByIds(updateParam.getAcctEmpIds().stream().collect(Collectors.toList()));
if (CollectionUtils.isEmpty(salaryAcctEmployees)) {
return;
}

2
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

@ -835,7 +835,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
if (CollectionUtils.isEmpty(calculateParam.getIds())) {
salaryAcctEmployeePOS = getSalaryAcctEmployeeService(user).listBySalaryAcctRecordId(salaryAcctRecordPO.getId());
} else {
salaryAcctEmployeePOS = getSalaryAcctEmployeeService(user).listByIds(calculateParam.getIds());
salaryAcctEmployeePOS = getSalaryAcctEmployeeService(user).listByIds(calculateParam.getIds().stream().collect(Collectors.toList()));
}
if (CollectionUtils.isEmpty(salaryAcctEmployeePOS)) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(103378, "薪资核算人员不能为空"));