diff --git a/src/com/engine/salary/biz/SalarySobItemBiz.java b/src/com/engine/salary/biz/SalarySobItemBiz.java index 66ac63d0c..1b998434a 100644 --- a/src/com/engine/salary/biz/SalarySobItemBiz.java +++ b/src/com/engine/salary/biz/SalarySobItemBiz.java @@ -34,16 +34,6 @@ public class SalarySobItemBiz { } } - public List listBySalarySobIdWithHideItem(SalarySobItemPO build) { - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - SalarySobItemMapper mapper = sqlSession.getMapper(SalarySobItemMapper.class); - return mapper.listBySalarySobIdWithHideItem(build); - } finally { - sqlSession.close(); - } - } - public void batchInsert(Collection salarySobItemPOS) { if (CollectionUtils.isEmpty(salarySobItemPOS)) { diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.java b/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.java index 0900cfa60..3827ce3f0 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.java +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.java @@ -24,7 +24,6 @@ public interface SalarySobItemMapper { */ List listSome(SalarySobItemPO salarySobItemPO); - List listBySalarySobIdWithHideItem(SalarySobItemPO salarySobItemPO); /** @@ -35,14 +34,7 @@ public interface SalarySobItemMapper { */ SalarySobItemPO getById(Long id); - /** - * 新增,忽略null字段 - * - * @param salarySobItemPO 新增的记录 - * @return 返回影响行数 - */ - int insertIgnoreNull(SalarySobItemPO salarySobItemPO); - + /** * 修改,修改所有字段 * @@ -50,7 +42,7 @@ public interface SalarySobItemMapper { * @return 返回影响行数 */ int update(SalarySobItemPO salarySobItemPO); - + /** * 修改,忽略null字段 * diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml index fb545ee6b..e6bd40a25 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml @@ -149,128 +149,6 @@ - - - - - - INSERT INTO hrsa_salary_sob_item - - - - create_time, - - - creator, - - - delete_type, - - - description, - - - formula_id, - - - id, - - - salary_item_id, - - - salary_sob_id, - - - salary_sob_item_group_id, - - - sorted_index, - - - tenant_key, - - - update_time, - - - can_delete, - - - item_hide, - - - - - #{createTime}, - - - #{creator}, - - - #{deleteType}, - - - #{description}, - - - #{formulaId}, - - - #{id}, - - - #{salaryItemId}, - - - #{salarySobId}, - - - #{salarySobItemGroupId}, - - - #{sortedIndex}, - - - #{tenantKey}, - - - #{updateTime}, - - - #{canDelete}, - - - #{itemHide}, - - - - UPDATE hrsa_salary_sob_item diff --git a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java index 413bbecd5..e247ec062 100644 --- a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java @@ -671,7 +671,7 @@ public class SalarySobServiceImpl extends Service implements SalarySobService { // 查询薪资账套的员工信息字段 List salarySobEmpFieldPOS = salarySobEmpFieldService.listSome(SalarySobEmpFieldPO.builder().salarySobId(duplicateParam.getId()).build()); // 查询薪资账套的薪资项目副本 - List salarySobItemPOS = salarySobItemService.listBySalarySobIdWithHideItem(SalarySobItemPO.builder().salarySobId(duplicateParam.getId()).build()); + List salarySobItemPOS = salarySobItemService.listSome(SalarySobItemPO.builder().salarySobId(duplicateParam.getId()).build()); // 薪资项目副本去重 salarySobItemPOS = salarySobItemPOS.stream().filter(SalaryEntityUtil.distinctByKey(PO -> PO.getSalarySobId() + "-" + PO.getSalaryItemId())).collect(Collectors.toList()); // 查询薪资账套的薪资项目分类