diff --git a/src/com/engine/salary/biz/AddUpDeductionBiz.java b/src/com/engine/salary/biz/AddUpDeductionBiz.java index 954cc157a..89b1b6212 100644 --- a/src/com/engine/salary/biz/AddUpDeductionBiz.java +++ b/src/com/engine/salary/biz/AddUpDeductionBiz.java @@ -6,6 +6,7 @@ import com.engine.salary.entity.datacollection.dto.AddUpDeductionRecordDTO; import com.engine.salary.entity.datacollection.param.AddUpDeductionQueryParam; import com.engine.salary.mapper.datacollection.AddUpDeductionMapper; import com.engine.salary.util.excel.ExcelUtil; +import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -93,10 +94,14 @@ public class AddUpDeductionBiz extends BaseBean { * @return */ public void batchSave(List param) { + if (CollectionUtils.isEmpty(param)) { + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AddUpDeductionMapper mapper = sqlSession.getMapper(AddUpDeductionMapper.class); - mapper.insertData(param); + List> partition = Lists.partition(param, 100); + partition.forEach(mapper::insertData); sqlSession.commit(); } finally { sqlSession.close(); @@ -110,10 +115,14 @@ public class AddUpDeductionBiz extends BaseBean { * @return */ public void batchUpdate(List param) { + if (CollectionUtils.isEmpty(param)) { + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AddUpDeductionMapper mapper = sqlSession.getMapper(AddUpDeductionMapper.class); - mapper.updateData(param); + List> partition = Lists.partition(param, 100); + partition.forEach(mapper::updateData); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/AddUpSituationBiz.java b/src/com/engine/salary/biz/AddUpSituationBiz.java index fbdd25146..bcae1b79e 100644 --- a/src/com/engine/salary/biz/AddUpSituationBiz.java +++ b/src/com/engine/salary/biz/AddUpSituationBiz.java @@ -6,6 +6,7 @@ import com.engine.salary.entity.datacollection.dto.AddUpSituationRecordDTO; import com.engine.salary.entity.datacollection.param.AddUpSituationQueryParam; import com.engine.salary.mapper.datacollection.AddUpSituationMapper; import com.engine.salary.util.excel.ExcelUtil; +import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -93,10 +94,14 @@ public class AddUpSituationBiz extends BaseBean { * @return */ public void batchSave(List param) { + if (CollectionUtils.isEmpty(param)) { + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class); - mapper.insertData(param); + List> partition = Lists.partition(param, 100); + partition.forEach(mapper::insertData); sqlSession.commit(); } finally { sqlSession.close(); @@ -110,10 +115,14 @@ public class AddUpSituationBiz extends BaseBean { * @return */ public void batchUpdate(List param) { + if (CollectionUtils.isEmpty(param)) { + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AddUpSituationMapper mapper = sqlSession.getMapper(AddUpSituationMapper.class); - mapper.updateData(param); + List> partition = Lists.partition(param, 100); + partition.forEach(mapper::updateData); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/AttendQuoteDataBiz.java b/src/com/engine/salary/biz/AttendQuoteDataBiz.java index 9bacae4f7..196eb5924 100644 --- a/src/com/engine/salary/biz/AttendQuoteDataBiz.java +++ b/src/com/engine/salary/biz/AttendQuoteDataBiz.java @@ -4,6 +4,8 @@ import com.engine.salary.entity.datacollection.dto.AttendQuoteDataBaseDTO; import com.engine.salary.entity.datacollection.param.AttendQuoteDataQueryParam; import com.engine.salary.entity.datacollection.po.AttendQuoteDataPO; import com.engine.salary.mapper.datacollection.AttendQuoteDataMapper; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -46,10 +48,14 @@ public class AttendQuoteDataBiz { } public void insertData(List pos) { + if(CollectionUtils.isEmpty(pos)){ + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AttendQuoteDataMapper mapper = sqlSession.getMapper(AttendQuoteDataMapper.class); - mapper.insertData(pos); + List> partition = Lists.partition(pos, 100); + partition.forEach(mapper::insertData); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java b/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java index 363e5c90b..2c99d188f 100644 --- a/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java +++ b/src/com/engine/salary/biz/AttendQuoteDataValueBiz.java @@ -2,6 +2,8 @@ package com.engine.salary.biz; import com.engine.salary.entity.datacollection.po.AttendQuoteDataValuePO; import com.engine.salary.mapper.datacollection.AttendQuoteDataValueMapper; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -38,10 +40,14 @@ public class AttendQuoteDataValueBiz { } public void insertData(List values) { + if(CollectionUtils.isEmpty(values)){ + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AttendQuoteDataValueMapper mapper = sqlSession.getMapper(AttendQuoteDataValueMapper.class); - mapper.insertData(values); + List> partition = Lists.partition(values, 100); + partition.forEach(mapper::insertData); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/AttendQuoteFieldBiz.java b/src/com/engine/salary/biz/AttendQuoteFieldBiz.java index 5858ff790..70d7c72fb 100644 --- a/src/com/engine/salary/biz/AttendQuoteFieldBiz.java +++ b/src/com/engine/salary/biz/AttendQuoteFieldBiz.java @@ -4,6 +4,8 @@ import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO; import com.engine.salary.entity.datacollection.param.AttendQuoteFieldQueryParam; import com.engine.salary.entity.datacollection.po.AttendQuoteFieldPO; import com.engine.salary.mapper.datacollection.AttendQuoteFieldMapper; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -79,10 +81,14 @@ public class AttendQuoteFieldBiz { } public void saveBatch(List saves) { + if(CollectionUtils.isEmpty(saves)){ + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { AttendQuoteFieldMapper mapper = sqlSession.getMapper(AttendQuoteFieldMapper.class); - mapper.saveBatch(saves); + List> partition = Lists.partition(saves, 100); + partition.forEach(mapper::saveBatch); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/OtherDeductionBiz.java b/src/com/engine/salary/biz/OtherDeductionBiz.java index 965a4dcc0..3383200b5 100644 --- a/src/com/engine/salary/biz/OtherDeductionBiz.java +++ b/src/com/engine/salary/biz/OtherDeductionBiz.java @@ -6,6 +6,7 @@ import com.engine.salary.entity.datacollection.param.OtherDeductionQueryParam; import com.engine.salary.entity.datacollection.po.OtherDeductionPO; import com.engine.salary.mapper.datacollection.OtherDeductionMapper; import com.engine.salary.util.excel.ExcelUtil; +import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import org.apache.poi.xssf.usermodel.XSSFWorkbook; @@ -93,10 +94,14 @@ public class OtherDeductionBiz extends BaseBean { * @return */ public void batchSave(List param) { + if(CollectionUtils.isEmpty(param)){ + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { OtherDeductionMapper mapper = sqlSession.getMapper(OtherDeductionMapper.class); - mapper.insertData(param); + List> partition = Lists.partition(param, 100); + partition.forEach(mapper::insertData); sqlSession.commit(); } finally { sqlSession.close(); @@ -110,10 +115,14 @@ public class OtherDeductionBiz extends BaseBean { * @return */ public void batchUpdate(List param) { + if(CollectionUtils.isEmpty(param)){ + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { OtherDeductionMapper mapper = sqlSession.getMapper(OtherDeductionMapper.class); - mapper.updateData(param); + List> partition = Lists.partition(param, 100); + partition.forEach(mapper::updateData); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/SalaryArchiveBiz.java b/src/com/engine/salary/biz/SalaryArchiveBiz.java index bd2477c75..796ec2a5f 100644 --- a/src/com/engine/salary/biz/SalaryArchiveBiz.java +++ b/src/com/engine/salary/biz/SalaryArchiveBiz.java @@ -6,6 +6,8 @@ import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO; import com.engine.salary.mapper.archive.SalaryArchiveMapper; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.PageUtil; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -48,10 +50,14 @@ public class SalaryArchiveBiz { } public void batchInsert(List salaryArchiveSaves) { + if (CollectionUtils.isEmpty(salaryArchiveSaves)) { + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalaryArchiveMapper mapper = sqlSession.getMapper(SalaryArchiveMapper.class); - mapper.batchInsert(salaryArchiveSaves); + List> partition = Lists.partition(salaryArchiveSaves, 100); + partition.forEach(mapper::batchInsert); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java index 0edc741cd..9fde456ff 100644 --- a/src/com/engine/salary/biz/SalaryArchiveItemBiz.java +++ b/src/com/engine/salary/biz/SalaryArchiveItemBiz.java @@ -7,6 +7,8 @@ import com.engine.salary.entity.salaryarchive.po.SalaryArchiveItemPO; import com.engine.salary.mapper.archive.SalaryArchiveItemMapper; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.PageUtil; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -77,10 +79,14 @@ public class SalaryArchiveItemBiz { } public void batchInsert(List salaryArchiveItemNews) { + if(CollectionUtils.isEmpty(salaryArchiveItemNews)){ + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalaryArchiveItemMapper mapper = sqlSession.getMapper(SalaryArchiveItemMapper.class); - mapper.batchInsert(salaryArchiveItemNews); + List> partition = Lists.partition(salaryArchiveItemNews, 100); + partition.forEach(mapper::batchInsert); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/SalaryArchiveTaxAgentBiz.java b/src/com/engine/salary/biz/SalaryArchiveTaxAgentBiz.java index 078673a91..d3ebf6388 100644 --- a/src/com/engine/salary/biz/SalaryArchiveTaxAgentBiz.java +++ b/src/com/engine/salary/biz/SalaryArchiveTaxAgentBiz.java @@ -3,6 +3,8 @@ package com.engine.salary.biz; import com.engine.salary.entity.salaryarchive.param.SalaryArchiveTaxAgentQueryParam; import com.engine.salary.entity.salaryarchive.po.SalaryArchiveTaxAgentPO; import com.engine.salary.mapper.archive.SalaryArchiveTaxAgentMapper; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -63,10 +65,14 @@ public class SalaryArchiveTaxAgentBiz { } public void batchInsert(List salaryArchiveTaxAgentSaves) { + if (CollectionUtils.isEmpty(salaryArchiveTaxAgentSaves)) { + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalaryArchiveTaxAgentMapper mapper = sqlSession.getMapper(SalaryArchiveTaxAgentMapper.class); - mapper.batchInsert(salaryArchiveTaxAgentSaves); + List> partition = Lists.partition(salaryArchiveTaxAgentSaves, 100); + partition.forEach(mapper::batchInsert); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/SalaryItemBiz.java b/src/com/engine/salary/biz/SalaryItemBiz.java index fdf8ce1db..ce9d120e7 100644 --- a/src/com/engine/salary/biz/SalaryItemBiz.java +++ b/src/com/engine/salary/biz/SalaryItemBiz.java @@ -6,6 +6,8 @@ import com.engine.salary.enums.SalaryOnOffEnum; import com.engine.salary.mapper.salaryitem.SalaryItemMapper; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.PageUtil; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -45,10 +47,14 @@ public class SalaryItemBiz { } public void batchSave(Collection salaryItems) { + if(CollectionUtils.isEmpty(salaryItems)){ + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalaryItemMapper mapper = sqlSession.getMapper(SalaryItemMapper.class); - mapper.batchInsert(salaryItems); + List> partition = Lists.partition((List) salaryItems, 100); + partition.forEach(mapper::batchInsert); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/SalarySobAdjustRuleBiz.java b/src/com/engine/salary/biz/SalarySobAdjustRuleBiz.java index a7c78feeb..5e7963abd 100644 --- a/src/com/engine/salary/biz/SalarySobAdjustRuleBiz.java +++ b/src/com/engine/salary/biz/SalarySobAdjustRuleBiz.java @@ -2,6 +2,8 @@ package com.engine.salary.biz; import com.engine.salary.entity.salarysob.po.SalarySobAdjustRulePO; import com.engine.salary.mapper.salarysob.SalarySobAdjustRuleMapper; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -32,10 +34,14 @@ public class SalarySobAdjustRuleBiz { } public void batchInsert(Collection salarySobAdjustRulePOS) { + if (CollectionUtils.isEmpty(salarySobAdjustRulePOS)) { + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalarySobAdjustRuleMapper mapper = sqlSession.getMapper(SalarySobAdjustRuleMapper.class); - mapper.batchInsert(salarySobAdjustRulePOS); + List> partition = Lists.partition((List) salarySobAdjustRulePOS, 100); + partition.forEach(mapper::batchInsert); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/SalarySobCheckRuleBiz.java b/src/com/engine/salary/biz/SalarySobCheckRuleBiz.java index 74d9abf9d..f78422684 100644 --- a/src/com/engine/salary/biz/SalarySobCheckRuleBiz.java +++ b/src/com/engine/salary/biz/SalarySobCheckRuleBiz.java @@ -5,6 +5,8 @@ import com.engine.salary.entity.salarysob.po.SalarySobCheckRulePO; import com.engine.salary.mapper.salarysob.SalarySobCheckRuleMapper; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.PageUtil; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -57,10 +59,14 @@ public class SalarySobCheckRuleBiz { } public void batchInsert(Collection salarySobCheckRulePOS) { + if(CollectionUtils.isEmpty(salarySobCheckRulePOS)){ + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalarySobCheckRuleMapper mapper = sqlSession.getMapper(SalarySobCheckRuleMapper.class); - mapper.batchInsert(salarySobCheckRulePOS); + List> partition = Lists.partition((List) salarySobCheckRulePOS, 100); + partition.forEach(mapper::batchInsert); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/SalarySobEmpFieldBiz.java b/src/com/engine/salary/biz/SalarySobEmpFieldBiz.java index 8fbe27e95..5762aef4c 100644 --- a/src/com/engine/salary/biz/SalarySobEmpFieldBiz.java +++ b/src/com/engine/salary/biz/SalarySobEmpFieldBiz.java @@ -4,6 +4,8 @@ import com.engine.salary.entity.salarysob.po.SalarySobDefaultEmpFieldPO; import com.engine.salary.entity.salarysob.po.SalarySobEmpFieldPO; import com.engine.salary.mapper.salarysob.SalarySobDefaultEmpFieldMapper; import com.engine.salary.mapper.salarysob.SalarySobEmpFieldMapper; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -26,10 +28,14 @@ public class SalarySobEmpFieldBiz { } public void batchInsert(Collection salarySobEmpFieldPOS) { + if(CollectionUtils.isEmpty(salarySobEmpFieldPOS)){ + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalarySobEmpFieldMapper mapper = sqlSession.getMapper(SalarySobEmpFieldMapper.class); - mapper.batchInsert(salarySobEmpFieldPOS); + List> partition = Lists.partition((List) salarySobEmpFieldPOS, 100); + partition.forEach(mapper::batchInsert); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/SalarySobItemBiz.java b/src/com/engine/salary/biz/SalarySobItemBiz.java index 19f04f95c..f741947a3 100644 --- a/src/com/engine/salary/biz/SalarySobItemBiz.java +++ b/src/com/engine/salary/biz/SalarySobItemBiz.java @@ -2,6 +2,8 @@ package com.engine.salary.biz; import com.engine.salary.entity.salarysob.po.SalarySobItemPO; import com.engine.salary.mapper.salarysob.SalarySobItemMapper; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -31,10 +33,14 @@ public class SalarySobItemBiz { } public void batchInsert(Collection salarySobItemPOS) { + if(CollectionUtils.isEmpty(salarySobItemPOS)){ + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalarySobItemMapper mapper = sqlSession.getMapper(SalarySobItemMapper.class); - mapper.batchInsert(salarySobItemPOS); + List> partition = Lists.partition((List) salarySobItemPOS, 100); + partition.forEach(mapper::batchInsert); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/biz/SalarySobRangeBiz.java b/src/com/engine/salary/biz/SalarySobRangeBiz.java index fd0b3f0e4..3580bc732 100644 --- a/src/com/engine/salary/biz/SalarySobRangeBiz.java +++ b/src/com/engine/salary/biz/SalarySobRangeBiz.java @@ -2,6 +2,8 @@ package com.engine.salary.biz; import com.engine.salary.entity.salarysob.po.SalarySobRangePO; import com.engine.salary.mapper.salarysob.SalarySobRangeMapper; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -22,10 +24,14 @@ public class SalarySobRangeBiz { } public void batchInsert(Collection needInsertSalarySobRanges) { + if(CollectionUtils.isEmpty(needInsertSalarySobRanges)){ + return; + } SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); try { SalarySobRangeMapper mapper = sqlSession.getMapper(SalarySobRangeMapper.class); - mapper.batchInsert(needInsertSalarySobRanges); + List> partition = Lists.partition((List) needInsertSalarySobRanges, 100); + partition.forEach(mapper::batchInsert); sqlSession.commit(); } finally { sqlSession.close(); diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java index 587b11bf8..c6c16ec7e 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java @@ -5,7 +5,6 @@ import com.engine.salary.entity.salaryarchive.param.SalaryArchiveQueryParam; import com.engine.salary.entity.salaryarchive.po.SalaryArchivePO; import org.apache.ibatis.annotations.Param; -import java.util.Collection; import java.util.List; public interface SalaryArchiveMapper { @@ -75,11 +74,11 @@ public interface SalaryArchiveMapper { - /** - * 批量删除薪资档案 - * @param ids - */ - void deleteByIds(@Param("ids") Collection ids); +// /** +// * 批量删除薪资档案 +// * @param ids +// */ +// void deleteByIds(@Param("ids") Collection ids); /** * 批量插入 diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.java b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.java index ed074f1fd..f5dfcc103 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.java +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemGroupMapper.java @@ -69,7 +69,6 @@ public interface SalarySobItemGroupMapper { * 根据薪资账套id删除 * * @param salarySobIds - * @param tenantKey */ void deleteBySalarySobIds(@Param("salarySobIds") Collection salarySobIds); @@ -77,7 +76,6 @@ public interface SalarySobItemGroupMapper { * 根据主键id删除 * * @param ids - * @param tenantKey */ void deleteByIds(@Param("ids") Collection ids); diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java index 580cdad3e..13a5d502e 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java @@ -23,6 +23,7 @@ import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.page.PageInfo; import com.engine.salary.util.page.PageUtil; import com.engine.salary.util.valid.ValidUtil; +import com.google.common.collect.Lists; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -141,7 +142,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct .setDeleteType(0)) .collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(newSalaryAcctEmployeePOS)) { - getSalaryAcctEmployeeMapper().batchInsert(newSalaryAcctEmployeePOS); + batchSave(newSalaryAcctEmployeePOS); } } @@ -300,7 +301,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct List salaryAcctEmployeePOS = SalaryAcctEmployeeBO.convert2EmployeePO(saveParam.getEmployeeIds(), salaryAcctRecordPO, salaryArchiveDataDTOS, (long) user.getUID()); // 保存薪资核算人员 if (CollectionUtils.isNotEmpty(salaryAcctEmployeePOS)) { - getSalaryAcctEmployeeMapper().batchInsert(salaryAcctEmployeePOS); + batchSave(salaryAcctEmployeePOS); } // 查询薪资账套(记录日志用) @@ -322,7 +323,11 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct @Override public void batchSave(Collection salaryAcctEmployeePOS) { - getSalaryAcctEmployeeMapper().batchInsert(salaryAcctEmployeePOS); + if(CollectionUtils.isEmpty(salaryAcctEmployeePOS)){ + return; + } + List> partition = Lists.partition((List) salaryAcctEmployeePOS, 100); + partition.forEach(getSalaryAcctEmployeeMapper()::batchInsert); } @Override @@ -408,7 +413,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct List salaryAcctEmployeePOS = SalaryAcctEmployeeBO.convert2EmployeePO(employeeIds, salaryAcctRecordPO, salaryArchiveDataDTOS, (long) user.getUID()); // 保存薪资核算人员 if (CollectionUtils.isNotEmpty(salaryAcctEmployeePOS)) { - getSalaryAcctEmployeeMapper().batchInsert(salaryAcctEmployeePOS); + batchSave(salaryAcctEmployeePOS); } } @@ -436,7 +441,7 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct getSalaryAcctEmployeeMapper().deleteBySalaryAcctRecordIds(Collections.singleton(salaryAcctRecordId)); // 插入新的薪资核算人员 if (CollectionUtils.isNotEmpty(newSalaryAcctEmployeePOS)) { - getSalaryAcctEmployeeMapper().batchInsert(newSalaryAcctEmployeePOS); + batchSave(newSalaryAcctEmployeePOS); } } } diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 38245a7e5..0a3d9c736 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -336,7 +336,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe deleteBySalaryAcctEmployeeIds(Collections.singleton(saveParam.getSalaryAcctEmpId())); // 保存薪资核算结果 if (CollectionUtils.isNotEmpty(salaryAcctResultPOS)) { - getSalaryAcctResultMapper().batchInsert(salaryAcctResultPOS); + batchSave(salaryAcctResultPOS); } // 查询操作日志的targetName String targetName = getSalaryAcctRecordService(user).getLogTargetNameById(salaryAcctEmployeePO.getSalaryAcctRecordId()); @@ -359,7 +359,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe @Override public void batchSave(Collection salaryAcctResultPOS) { if (CollectionUtils.isNotEmpty(salaryAcctResultPOS)) { - getSalaryAcctResultMapper().batchInsert(salaryAcctResultPOS); + List> partition = Lists.partition((List) salaryAcctResultPOS, 100); + partition.forEach(getSalaryAcctResultMapper()::batchInsert); } } diff --git a/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java index 6b4eeb63c..42b3e05d5 100644 --- a/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryComparisonResultServiceImpl.java @@ -30,6 +30,7 @@ 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.PageUtil; +import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; @@ -240,7 +241,11 @@ public class SalaryComparisonResultServiceImpl extends Service implements Salary @Override public void batchSave(Collection excelAcctResultPOS) { - getExcelAcctResultMapper().batchInsert(excelAcctResultPOS); + if(CollectionUtils.isEmpty(excelAcctResultPOS)){ + return; + } + List> partition = Lists.partition((List) excelAcctResultPOS, 100); + partition.forEach(getExcelAcctResultMapper()::batchInsert); } @Override diff --git a/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java index a3735e3fc..3c74a8470 100644 --- a/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxDeclarationDetailServiceImpl.java @@ -14,6 +14,7 @@ import com.engine.salary.service.SalaryEmployeeService; import com.engine.salary.service.TaxDeclarationDetailService; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.page.PageInfo; +import com.google.common.collect.Lists; import com.mzlion.core.lang.CollectionUtils; import java.util.Collection; @@ -32,6 +33,7 @@ public class TaxDeclarationDetailServiceImpl extends Service implements TaxDecla private TaxDeclarationDetailMapper getTaxDeclarationDetailMapper() { return MapperProxyFactory.getProxy(TaxDeclarationDetailMapper.class); } + private SalaryEmployeeService getSalaryEmployeeService() { return (SalaryEmployeeService) ServiceUtil.getService(SalaryEmployeeServiceImpl.class, user); } @@ -64,7 +66,7 @@ public class TaxDeclarationDetailServiceImpl extends Service implements TaxDecla PageInfo dtoPage = new PageInfo(TaxDeclarationDetailListDTO.class); dtoPage.setPageNum(queryParam.getCurrent()); dtoPage.setPageSize(queryParam.getPageSize()); - if(null==employeeIdPage){ + if (null == employeeIdPage) { return dtoPage; } if (CollectionUtils.isNotEmpty(employeeIdPage)) { @@ -72,7 +74,7 @@ public class TaxDeclarationDetailServiceImpl extends Service implements TaxDecla List taxDeclarationDetailPOS = listByTaxDeclarationIdAndEmployeeIds(queryParam.getTaxDeclarationId(), employeeIdPage); // 查询人员 List simpleEmployees = getSalaryEmployeeService().listByIds(employeeIdPage); - // List simpleEmployees = hrmCommonEmployeeService.getEmployeeByIds(employeeIdPage.getRecords(), tenantKey); + // List simpleEmployees = hrmCommonEmployeeService.getEmployeeByIds(employeeIdPage.getRecords(), tenantKey); // 转换成列表dto TaxDeclarationBO.buildDetailListDTO(queryParam.getTaxDeclarationId(), dtoPage, taxDeclarationDetailPOS, simpleEmployees); } @@ -91,8 +93,12 @@ public class TaxDeclarationDetailServiceImpl extends Service implements TaxDecla @Override public void batchSave(Collection taxDeclarationDetailPOS) { - getTaxDeclarationDetailMapper().batchInsert(taxDeclarationDetailPOS); + if (CollectionUtils.isNotEmpty(taxDeclarationDetailPOS)) { + List> partition = Lists.partition((List) taxDeclarationDetailPOS, 100); + partition.forEach(getTaxDeclarationDetailMapper()::batchInsert); + } } + public List listByTaxDeclarationIdAndEmployeeIds(Long taxDeclarationId, List employeeIds) { if (CollectionUtils.isEmpty(employeeIds)) { return Collections.emptyList(); @@ -104,7 +110,7 @@ public class TaxDeclarationDetailServiceImpl extends Service implements TaxDecla // .eq(TaxDeclarationDetailPO::getTaxDeclarationId, taxDeclarationId) // .in(TaxDeclarationDetailPO::getEmployeeId, employeeIds) // .list(); - return getTaxDeclarationDetailMapper().listByTaxDeclarationIdAndEmployeeIds(taxDeclarationId,employeeIds); + return getTaxDeclarationDetailMapper().listByTaxDeclarationIdAndEmployeeIds(taxDeclarationId, employeeIds); } @Override diff --git a/src/com/engine/salary/util/db/MapperProxyFactory.java b/src/com/engine/salary/util/db/MapperProxyFactory.java index 470d5d10b..953cdeae1 100644 --- a/src/com/engine/salary/util/db/MapperProxyFactory.java +++ b/src/com/engine/salary/util/db/MapperProxyFactory.java @@ -22,9 +22,7 @@ public class MapperProxyFactory implements InvocationHandler { @Override public Object invoke(Object proxy, Method method, Object[] args) throws Exception { - if (this.session == null) { - this.session = MyBatisFactory.sqlSessionFactory.openSession(); - } + this.session = MyBatisFactory.sqlSessionFactory.openSession(); try { Object target = session.getMapper(clazz); return method.invoke(target, args); diff --git a/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java b/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java index 81142f67c..938fd4b86 100644 --- a/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java +++ b/src/com/engine/salary/wrapper/TaxDeclarationWrapper.java @@ -7,6 +7,7 @@ import com.engine.salary.biz.SalaryItemBiz; import com.engine.salary.biz.TaxAgentBiz; import com.engine.salary.common.LocalDateRange; import com.engine.salary.component.WeaFormOption; +import com.engine.salary.entity.datacollection.AddUpSituation; import com.engine.salary.entity.datacollection.DataCollectionEmployee; import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO; import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO; @@ -267,7 +268,8 @@ public class TaxDeclarationWrapper extends Service { if (CollectionUtils.isNotEmpty(result.getNeedInsertAccumulatedSituations())) { Set taxAgentIds = SalaryEntityUtil.properties(result.getNeedInsertTaxDeclarations(), TaxDeclarationPO::getTaxAgentId); getAddUpSituationService(user).deleteByTaxYearMonthAndTaxAgentIds(SalaryDateUtil.localDate2YearMonth(taxCycle),taxAgentIds); - getAddUpSituationMapper().insertData(Lists.newArrayList(result.getNeedInsertAccumulatedSituations())); + List> partition = Lists.partition((List) result.getNeedInsertAccumulatedSituations(), 100); + partition.forEach(getAddUpSituationMapper()::insertData); } // 更新薪资核算记录的状态 getSalaryAcctRecordService(user).updateStatusByIds(salaryAcctRecordIds, SalaryAcctRecordStatusEnum.DECLARED);