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

修复大数据量，重新核算报错

This commit is contained in:
钱涛 2024-09-23 11:10:25 +08:00
parent dc3dfc2d6b
commit 164a97a8e0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
View File

@ -253,9 +253,10 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
AddUpSituationBiz biz = new AddUpSituationBiz();
List<AddUpSituation> addUpSituations = biz.listSome(AddUpSituation.builder().taxAgentId(taxAgentId).taxYearMonth(taxCycle).build());
Set<Long> addUpSituationIds = SalaryEntityUtil.properties(addUpSituations, AddUpSituation::getId);
List<Long> addUpSituationIds = SalaryEntityUtil.properties(addUpSituations, AddUpSituation::getId, Collectors.toList());
if (CollectionUtils.isNotEmpty(addUpSituationIds)) {
getAddUpSituationMapper().deleteByIds(addUpSituationIds);
List<List<Long>> partition = Lists.partition(addUpSituationIds, 100);
partition.forEach(getAddUpSituationMapper()::deleteByIds);
}
return Boolean.TRUE;
@ -611,7 +612,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
String idNo = dto.getIdNo();
//筛选导入人员信息可以在人力资源池中匹配到的人员信息
List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, idNo,null);
List<DataCollectionEmployee> employeeSameIds = getSalaryEmployeeService(user).matchImportEmployee(confValue, employees, userName, deparmentName, mobile, workcode, idNo, null);
//当人员信息导入筛选的全局配置为"0"时，姓名才是必填项
if (StringUtils.isBlank(userName) && "0".equals(confValue)) {