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

修复往期累计导入数量限制

This commit is contained in:
钱涛 2022-07-13 09:53:11 +08:00
parent 4258e7f545
commit 1d90bb148e
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/biz/AddUpSituationBiz.java
View File

@ -103,7 +103,7 @@ public class AddUpSituationBiz extends BaseBean {
try {
AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class);
AddUpSituationEncrypt.encryptAddUpSituationList(param);
List<List<AddUpSituation>> partition = Lists.partition(param, 100);
List<List<AddUpSituation>> partition = Lists.partition(param, 50);
partition.forEach(mapper::insertData);
sqlSession.commit();
} finally {
@ -125,7 +125,7 @@ public class AddUpSituationBiz extends BaseBean {
try {
AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class);
AddUpSituationEncrypt.encryptAddUpSituationList(param);
List<List<AddUpSituation>> partition = Lists.partition(param, 100);
List<List<AddUpSituation>> partition = Lists.partition(param, 50);
partition.forEach(mapper::updateData);
sqlSession.commit();
} finally {

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

@ -73,4 +73,6 @@ public interface AddUpSituationService {
boolean deleteByTaxYearMonthAndTaxAgentIds(YearMonth localDate2YearMonth, Collection<Long> taxAgentIds);
void batchSave(List<AddUpSituation> list);
}

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

@ -225,7 +225,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100353, "参数有误：税款所属期必传"));
}
if(CollectionUtils.isEmpty(employeeIds)){
if (CollectionUtils.isEmpty(employeeIds)) {
return Boolean.TRUE;
}
@ -789,4 +789,13 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation
throw new SalaryRunTimeException("税款所属期为空");
}
}
@Override
public void batchSave(List<AddUpSituation> list) {
if (CollectionUtils.isNotEmpty(list)) {
List<List<AddUpSituation>> partition = Lists.partition(list, 50);
partition.forEach(getAddUpSituationMapper()::insertData);
}
}
}

5
src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
View File

@ -3,7 +3,6 @@ package com.engine.salary.service.impl;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.common.LocalDateRange;
import com.engine.salary.entity.datacollection.AddUpSituation;
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
@ -25,7 +24,6 @@ import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.MapperProxyFactory;
import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import weaver.hrm.User;
@ -219,8 +217,7 @@ public class TaxDeclarationServiceImpl extends Service implements TaxDeclaration
// 保存累计情况
if (CollectionUtils.isNotEmpty(result.getNeedInsertAddUpSituations())) {
getAddUpSituationService(user).deleteByTaxYearMonthAndTaxAgentIds(SalaryDateUtil.localDate2YearMonth(taxCycle), taxAgentIds);
List<List<AddUpSituation>> partition = Lists.partition((List) result.getNeedInsertAddUpSituations(), 100);
partition.forEach(getAddUpSituationMapper()::insertData);
getAddUpSituationService(user).batchSave((List)result.getNeedInsertAddUpSituations());
}
// 更新薪资核算记录的状态
getSalaryAcctRecordService(user).updateStatusByIds(salaryAcctRecordIds, SalaryAcctRecordStatusEnum.DECLARED);