diff --git a/src/com/engine/salary/biz/SalarySobItemBiz.java b/src/com/engine/salary/biz/SalarySobItemBiz.java index bd7cfde0e..a6c56da77 100644 --- a/src/com/engine/salary/biz/SalarySobItemBiz.java +++ b/src/com/engine/salary/biz/SalarySobItemBiz.java @@ -105,4 +105,6 @@ public class SalarySobItemBiz { sqlSession.close(); } } + + } diff --git a/src/com/engine/salary/biz/SalarySobItemHideBiz.java b/src/com/engine/salary/biz/SalarySobItemHideBiz.java index ceec5ab42..e694bc5c7 100644 --- a/src/com/engine/salary/biz/SalarySobItemHideBiz.java +++ b/src/com/engine/salary/biz/SalarySobItemHideBiz.java @@ -5,6 +5,7 @@ import com.engine.salary.mapper.salarysob.SalarySobItemHideMapper; import org.apache.ibatis.session.SqlSession; import weaver.conn.mybatis.MyBatisFactory; +import java.util.Collection; import java.util.List; public class SalarySobItemHideBiz { @@ -19,4 +20,14 @@ public class SalarySobItemHideBiz { } } + public void deleteBySalarySobIds(Collection ids) { + SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); + try { + SalarySobItemHideMapper mapper = sqlSession.getMapper(SalarySobItemHideMapper.class); + mapper.deleteBySalarySobIds(ids); + sqlSession.commit(); + } finally { + sqlSession.close(); + } + } } diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobDuplicateBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobDuplicateBO.java index abcdda964..25e012117 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobDuplicateBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobDuplicateBO.java @@ -145,6 +145,7 @@ public class SalarySobDuplicateBO { .salarySobId(result.getSalarySob().getId()) .sortedIndex(salarySobItemGroup.getSortedIndex()) .description(salarySobItemGroup.getDescription()) + .itemHide(salarySobItemGroup.getItemHide()) .creator(employeeId) .createTime(now) .updateTime(now) @@ -181,6 +182,7 @@ public class SalarySobDuplicateBO { .sortedIndex(salarySobItem.getSortedIndex()) .description(salarySobItem.getDescription()) .canDelete(salarySobItem.getCanDelete()) + .itemHide(salarySobItem.getItemHide()) .creator(employeeId) .createTime(now) .updateTime(now) diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.java b/src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.java index bd2033fa5..2a8dff6e7 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.java +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.java @@ -1,7 +1,9 @@ package com.engine.salary.mapper.salarysob; import com.engine.salary.entity.salarysob.po.SalarySobItemHidePO; +import org.apache.ibatis.annotations.Param; +import java.util.Collection; import java.util.List; public interface SalarySobItemHideMapper { @@ -12,4 +14,12 @@ public interface SalarySobItemHideMapper { * @return */ List getById(SalarySobItemHidePO salarySobPO); + + /*** + * @description 删除薪资账套的薪资项目隐藏信息 + * @return void + * @author Harryxzy + * @date 2022/9/22 9:14 + */ + void deleteBySalarySobIds(@Param("ids") Collection ids); } diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.xml index db0e0037a..a4d34e841 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.xml @@ -1,7 +1,14 @@ - + + delete from hrsa_salary_item_hide + WHERE delete_type = 0 + AND salary_sob_id IN + + #{salarySobId} + + diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.java b/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.java index 9c96ac650..424e3f91e 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.java +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.java @@ -108,4 +108,6 @@ public interface SalarySobItemMapper { * @param */ List listBySalarySobIdAndGroupId(@Param("salarySobId") Long salarySobId,@Param("salarySobItemGroupIds") Collection salarySobItemGroupIds); + + } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml b/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml index 624eb4f93..eac7cddd7 100644 --- a/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml +++ b/src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml @@ -435,4 +435,5 @@ + \ No newline at end of file diff --git a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java index f2e1f2d65..e586cb2c3 100644 --- a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java @@ -33,6 +33,7 @@ import com.engine.salary.util.page.SalaryPageUtil; import com.engine.salary.util.valid.RuntimeTypeEnum; import com.engine.salary.util.valid.ValidUtil; import com.google.common.collect.Lists; +import dm.jdbc.util.IdGenerator; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -65,6 +66,8 @@ public class SalarySobServiceImpl extends Service implements SalarySobService { private SalarySobItemBiz salarySobItemService = new SalarySobItemBiz(); private SalarySobItemGroupBiz salarySobItemGroupService = new SalarySobItemGroupBiz(); + private SalarySobItemHideBiz salarySobItemHideService = new SalarySobItemHideBiz(); + private SalarySobMapper getSalarySobMapper() { return MapperProxyFactory.getProxy(SalarySobMapper.class); } @@ -425,6 +428,8 @@ public class SalarySobServiceImpl extends Service implements SalarySobService { salarySobItemService.deleteBySalarySobIds(ids); // 删除薪资账套的薪资项目分类 salarySobItemGroupService.deleteBySalarySobIds(ids); + // 删除薪资账套的薪资项目隐藏信息 + salarySobItemHideService.deleteBySalarySobIds(ids); // 删除薪资账套的调薪计薪规则 salarySobAdjustRuleService.deleteBySalarySobIds(ids); // // 删除薪资账套的校验规则 @@ -468,9 +473,9 @@ public class SalarySobServiceImpl extends Service implements SalarySobService { // 查询薪资账套的员工信息字段 List salarySobEmpFieldPOS = salarySobEmpFieldService.listSome(SalarySobEmpFieldPO.builder().salarySobId(duplicateParam.getId()).build()); // 查询薪资账套的薪资项目副本 - List salarySobItemPOS = salarySobItemService.listSome(SalarySobItemPO.builder().salarySobId(duplicateParam.getId()).build()); + List salarySobItemPOS = salarySobItemService.listBySalarySobIdWithHideItem(SalarySobItemPO.builder().salarySobId(duplicateParam.getId()).build()); // 查询薪资账套的薪资项目分类 - List salarySobItemGroupPOS = salarySobItemGroupService.listSome(SalarySobItemGroupPO.builder().salarySobId(duplicateParam.getId()).build()); + List salarySobItemGroupPOS = salarySobItemGroupService.listSomeWithItemHide(SalarySobItemGroupPO.builder().salarySobId(duplicateParam.getId()).build()); // 查询薪资账套的调薪计薪规则 List salarySobAdjustRulePOS = salarySobAdjustRuleService.listBySalarySobId(duplicateParam.getId()); // 查询薪资账套的校验规则 @@ -508,10 +513,62 @@ public class SalarySobServiceImpl extends Service implements SalarySobService { if (CollectionUtils.isNotEmpty(result.getSalarySobItems())) { salarySobItemService.batchInsert(result.getSalarySobItems()); } + + // 复制薪资账套的薪资项目隐藏副本 + if (CollectionUtils.isNotEmpty(result.getSalarySobItems())) { + List salarySobItems = result.getSalarySobItems(); + Date now = new Date(); + salarySobItems.stream().forEach(k->{ + Long salarySobItemShowId = IdGenerator.generate(); + SalarySobItemHidePO salarySobItemHidePO = SalarySobItemHidePO.builder() + .id(salarySobItemShowId) + .salarySobId(k.getSalarySobId()) + .salaryItemId(k.getSalaryItemId()) + .isGroup(0) + .itemHide(k.getItemHide()) + .creator((long)user.getUID()) + .deleteType(NumberUtils.INTEGER_ZERO) + .createTime(now) + .updateTime(now) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build(); + if(k.getItemHide()==null){ + salarySobItemHidePO.setItemHide(Long.valueOf(0)); + } + salarySobItemService.InsertItemShow(salarySobItemHidePO); + }); + } + // 复制薪资账套的薪资项目分类 if (CollectionUtils.isNotEmpty(result.getSalarySobItemGroups())) { salarySobItemGroupService.batchInsert(result.getSalarySobItemGroups()); } + + // 复制薪资账套的薪资项目分类隐藏信息 + if (CollectionUtils.isNotEmpty(result.getSalarySobItemGroups())) { + List salarySobItemGroups = result.getSalarySobItemGroups(); + Date now = new Date(); + salarySobItemGroups.stream().forEach(k->{ + Long salarySobItemShowId = IdGenerator.generate(); + SalarySobItemHidePO salarySobItemHidePO = SalarySobItemHidePO.builder() + .id(salarySobItemShowId) + .salarySobId(k.getSalarySobId()) + .salaryItemId(k.getId()) + .isGroup(1) + .itemHide(k.getItemHide()) + .creator((long)user.getUID()) + .deleteType(NumberUtils.INTEGER_ZERO) + .createTime(now) + .updateTime(now) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build(); + if(k.getItemHide()==null){ + salarySobItemHidePO.setItemHide(Long.valueOf(0)); + } + salarySobItemService.InsertItemShow(salarySobItemHidePO); + }); + } + // 复制薪资账套的调薪计薪规则 if (CollectionUtils.isNotEmpty(result.getSalaryAdjustmentRules())) { salarySobAdjustRuleService.batchInsert(result.getSalaryAdjustmentRules());