From d647f9fcc3f31792e0f6b4a403dcf0d7f69b176e Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Thu, 22 Sep 2022 09:06:53 +0800 Subject: [PATCH] =?UTF-8?q?xzy-=E5=A4=8D=E5=88=B6=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E8=B4=A6=E5=A5=97=E6=97=B6=EF=BC=8C=E5=A4=8D=E5=88=B6=E8=96=AA?= =?UTF-8?q?=E8=B5=84=E9=A1=B9=E7=9B=AE=E9=9A=90=E8=97=8F=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/biz/SalarySobItemBiz.java | 2 + .../salarysob/bo/SalarySobDuplicateBO.java | 2 + .../mapper/salarysob/SalarySobItemMapper.java | 2 + .../mapper/salarysob/SalarySobItemMapper.xml | 1 + .../service/impl/SalarySobServiceImpl.java | 57 ++++++++++++++++++- 5 files changed, 62 insertions(+), 2 deletions(-) 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/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/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..0a1722aa0 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; @@ -468,9 +469,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 +509,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());