diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.java b/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.java index 56c6a8a4e..606b70c5c 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.java +++ b/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.java @@ -1,10 +1,10 @@ package com.engine.salary.mapper.salarybill; import com.engine.salary.entity.salaryBill.po.SalarySendRangeObj; -import java.util.Date; -import java.util.List; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface SalarySendRangeObjMapper { int deleteByPrimaryKey(Long id); @@ -16,7 +16,9 @@ public interface SalarySendRangeObjMapper { List selectByAll(SalarySendRangeObj salarySendRangeObj); - List selectBySalarySendIdAndSalarySendRangeId(@Param("salarySendId") Long salarySendId, @Param("salarySendRangeId") Long salarySendRangeId); + List selectBySalarySendIdAndSalarySendRangeId(@Param("salarySendId") Long salarySendId, + @Param("salarySendRangeIds") List salarySendRangeId, + @Param("tenantKey") String tenantKey); int updateBatchSelective(List list); diff --git a/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.xml b/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.xml index 13367c472..d986c9b09 100644 --- a/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.xml +++ b/src/com/engine/salary/mapper/salarybill/SalarySendRangeObjMapper.xml @@ -187,12 +187,15 @@ diff --git a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml index 9643d377d..e69a245c3 100644 --- a/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml +++ b/src/com/engine/salary/mapper/sischeme/InsuranceSchemeMapper.xml @@ -32,7 +32,7 @@ , t.creator , t.delete_type , t.tenant_key - , t.shared_type + , t.1】 , t.tax_agent_ids diff --git a/src/com/engine/salary/service/SalarySendRangeObjService.java b/src/com/engine/salary/service/SalarySendRangeObjService.java new file mode 100644 index 000000000..2f6fa1b78 --- /dev/null +++ b/src/com/engine/salary/service/SalarySendRangeObjService.java @@ -0,0 +1,60 @@ +package com.engine.salary.service; + +import com.engine.salary.entity.salaryBill.po.SalarySendRangeObj; + +import java.util.Collection; +import java.util.List; + +/** + * @Description: 工资单发放撤回筛选范围对象 + * @Author: LFC + */ +public interface SalarySendRangeObjService { + + /** + * 根据名称和工资单发放id获取列表 + * + * @param salarySendId + * @param rangeIds + * @param currentTenantKey + * @return + */ + List listBySalarySendIdAndRangeIds(Long salarySendId, List rangeIds, String currentTenantKey); + + /** + * 保存筛选范围对象 + * + * @param listObj + * @param currentEmployeeId + * @param currentTenantKey + */ + void batchInsert(List listObj, Long currentEmployeeId, String currentTenantKey); + + /** + * 根据工资饭发放id删除 + * + * @param salarySendIds + * @param currentTenantKey + */ + void deleteBySalarySendIds(Collection salarySendIds, String currentTenantKey); + + /** + * 根据范围id删除 + * + * @param rangeIds + * @param currentEmployeeId + * @param currentTenantKey + */ + void deleteByRangeIds(Collection rangeIds, Long currentEmployeeId, String currentTenantKey); + + /** + * 根据发放id和范围id获取发放信息id + * + * @param salarySendId + * @param rangeIds + * @param employeeId + * @param tenantKey + * @return + */ + List getSendInfoIdsBySalarySendIdAndRangeIds(Long salarySendId, List rangeIds, Long employeeId, String tenantKey); +} \ 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 new file mode 100644 index 000000000..fb97c1658 --- /dev/null +++ b/src/com/engine/salary/service/impl/SalarySendRangeObjServiceImpl.java @@ -0,0 +1,54 @@ +package com.engine.salary.service.impl; + +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 org.apache.ibatis.session.SqlSession; +import weaver.conn.mybatis.MyBatisFactory; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.function.Function; + +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); + return mapper.apply(salarySendRangeObjMapper); + } + } + + @Override + public List listBySalarySendIdAndRangeIds(Long salarySendId, List rangeIds, String currentTenantKey) { + if (salarySendId == null) { + return Collections.emptyList(); + } + runSalarySendRangeObjMapper(mapper-> + mapper.selectBySalarySendIdAndSalarySendRangeId(salarySendId, rangeIds, currentTenantKey) + ); + return null; + } + + @Override + public void batchInsert(List listObj, Long currentEmployeeId, String currentTenantKey) { + + } + + @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) { + return null; + } +} diff --git a/src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java new file mode 100644 index 000000000..bfa89b7be --- /dev/null +++ b/src/com/engine/salary/service/impl/SalarySendRangeServiceImpl.java @@ -0,0 +1,43 @@ +package com.engine.salary.service.impl; + +import com.engine.core.impl.Service; +import com.engine.salary.service.SalarySendRangeService; + +import java.util.Collection; + +public class SalarySendRangeServiceImpl extends Service implements SalarySendRangeService { + @Override + public void save() { + + } + + @Override + public void listPage() { + + } + + @Override + public void listDTO() { + + } + + @Override + public void listByIds() { + + } + + @Override + public void getById(Long id) { + + } + + @Override + public void deleteBySalarySendIds(Collection sendIds) { + + } + + @Override + public void getSendInfoIdsBySendId(Collection sendIds) { + + } +}