diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.java b/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.java index 606b70c5c..4d4836eb6 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.java +++ b/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.java @@ -3,6 +3,7 @@ import com.engine.salary.entity.salaryBill.po.SalarySendRangeObj; import org.apache.ibatis.annotations.Param; +import java.util.Collection; import java.util.List; public interface SalarySendRangeObjMapper { @@ -16,11 +17,15 @@ public interface SalarySendRangeObjMapper { List selectByAll(SalarySendRangeObj salarySendRangeObj); - List selectBySalarySendIdAndSalarySendRangeId(@Param("salarySendId") Long salarySendId, - @Param("salarySendRangeIds") List salarySendRangeId, - @Param("tenantKey") String tenantKey); + List listBySalarySendIdAndRangeIds(@Param("salarySendId") Long salarySendId, + @Param("salarySendRangeIds") List salarySendRangeId, + @Param("tenantKey") String tenantKey); int updateBatchSelective(List list); int batchInsert(@Param("list") List list); + + int deleteBySalarySendIds(@Param("salarySendIds") Collection salarySendIds); + + } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.xml index d986c9b09..46e6cb0b9 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.xml @@ -186,11 +186,12 @@ - select from hrsa_salary_send_range_obj where salary_send_id=#{salarySendId,jdbcType=BIGINT} + and delete_type = 0 and tenant_key = #{tenantKey} salary_send_range_id=#{salarySendRangeId,jdbcType=BIGINT} @@ -317,4 +318,15 @@ from dual + + + update hrsa_salary_send_range_obj + set delete_type = 1 + where salary_send_id in ( + + #{salarySendId} + + ) + and delete_type = 0 + \ No newline at end of file diff --git a/src/com/engine/salary/service/SalarySendRangeObjService.java b/src/com/engine/salary/service/SalarySendRangeObjService.java index 2f6fa1b78..4f623ee32 100644 --- a/src/com/engine/salary/service/SalarySendRangeObjService.java +++ b/src/com/engine/salary/service/SalarySendRangeObjService.java @@ -16,27 +16,23 @@ public interface SalarySendRangeObjService { * * @param salarySendId * @param rangeIds - * @param currentTenantKey * @return */ - List listBySalarySendIdAndRangeIds(Long salarySendId, List rangeIds, String currentTenantKey); + List listBySalarySendIdAndRangeIds(Long salarySendId, List rangeIds); /** * 保存筛选范围对象 * * @param listObj - * @param currentEmployeeId - * @param currentTenantKey */ - void batchInsert(List listObj, Long currentEmployeeId, String currentTenantKey); + void batchInsert(List listObj); /** * 根据工资饭发放id删除 * * @param salarySendIds - * @param currentTenantKey */ - void deleteBySalarySendIds(Collection salarySendIds, String currentTenantKey); + void deleteBySalarySendIds(Collection salarySendIds); /** * 根据范围id删除 @@ -45,7 +41,7 @@ public interface SalarySendRangeObjService { * @param currentEmployeeId * @param currentTenantKey */ - void deleteByRangeIds(Collection rangeIds, Long currentEmployeeId, String currentTenantKey); + void deleteByRangeIds(Collection rangeIds, Long currentEmployeeId); /** * 根据发放id和范围id获取发放信息id @@ -53,8 +49,7 @@ public interface SalarySendRangeObjService { * @param salarySendId * @param rangeIds * @param employeeId - * @param tenantKey * @return */ - List getSendInfoIdsBySalarySendIdAndRangeIds(Long salarySendId, List rangeIds, Long employeeId, String tenantKey); + List getSendInfoIdsBySalarySendIdAndRangeIds(Long salarySendId, List rangeIds, Long employeeId); } \ No newline at end of file diff --git a/src/com/engine/salary/service/impl/SalarySendRangeObjServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendRangeObjServiceImpl.java index fb97c1658..9b71f5e3b 100644 --- a/src/com/engine/salary/service/impl/SalarySendRangeObjServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendRangeObjServiceImpl.java @@ -4,6 +4,8 @@ import com.engine.core.impl.Service; import com.engine.salary.entity.salaryBill.po.SalarySendRangeObj; import com.engine.salary.mapper.salarybill.SalarySendRangeObjMapper; import com.engine.salary.service.SalarySendRangeObjService; +import com.google.common.collect.Lists; +import org.apache.commons.collections4.CollectionUtils; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; @@ -12,43 +14,48 @@ import java.util.Collections; import java.util.List; import java.util.function.Function; +import static com.engine.salary.constant.SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY; + public class SalarySendRangeObjServiceImpl extends Service implements SalarySendRangeObjService { private R runSalarySendRangeObjMapper(Function mapper) { - try (SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession()){ - final SalarySendRangeObjMapper salarySendRangeObjMapper = sqlSession.getMapper(SalarySendRangeObjMapper.class); + try (SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession()) { + final SalarySendRangeObjMapper salarySendRangeObjMapper = sqlSession.getMapper(SalarySendRangeObjMapper.class); return mapper.apply(salarySendRangeObjMapper); } } @Override - public List listBySalarySendIdAndRangeIds(Long salarySendId, List rangeIds, String currentTenantKey) { - if (salarySendId == null) { + public List listBySalarySendIdAndRangeIds(Long salarySendId, List rangeIds) { + if (salarySendId == null || CollectionUtils.isEmpty(rangeIds)) { return Collections.emptyList(); } - runSalarySendRangeObjMapper(mapper-> - mapper.selectBySalarySendIdAndSalarySendRangeId(salarySendId, rangeIds, currentTenantKey) + return runSalarySendRangeObjMapper(mapper -> + mapper.listBySalarySendIdAndRangeIds(salarySendId, rangeIds, DEFAULT_TENANT_KEY) ); - return null; } @Override - public void batchInsert(List listObj, Long currentEmployeeId, String currentTenantKey) { + public void batchInsert(List listObj) { + if (listObj == null) { + return; + } + List> p = Lists.partition(listObj, 150); + p.forEach(list-> runSalarySendRangeObjMapper(m->m.batchInsert(list))); + } + + @Override + public void deleteBySalarySendIds(Collection salarySendIds) { + runSalarySendRangeObjMapper(mapper->mapper.deleteBySalarySendIds(salarySendIds)); + } + + @Override + public void deleteByRangeIds(Collection rangeIds, Long currentEmployeeId) { } @Override - public void deleteBySalarySendIds(Collection salarySendIds, String currentTenantKey) { - - } - - @Override - public void deleteByRangeIds(Collection rangeIds, Long currentEmployeeId, String currentTenantKey) { - - } - - @Override - public List getSendInfoIdsBySalarySendIdAndRangeIds(Long salarySendId, List rangeIds, Long employeeId, String tenantKey) { + public List getSendInfoIdsBySalarySendIdAndRangeIds(Long salarySendId, List rangeIds, Long employeeId) { return null; } }