qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'origin/feature/salarySobCopyHide_xzy' into develop

This commit is contained in:
Harryxzy 2022-09-22 09:39:22 +08:00
parent 63c7577ef8 f2b83bf837
commit 26c3f4580e
8 changed files with 95 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/biz/SalarySobItemBiz.java
View File

@ -105,4 +105,6 @@ public class SalarySobItemBiz {
sqlSession.close();
}
}
}

11
src/com/engine/salary/biz/SalarySobItemHideBiz.java
View File

@ -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<Long> ids) {
SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession();
try {
SalarySobItemHideMapper mapper = sqlSession.getMapper(SalarySobItemHideMapper.class);
mapper.deleteBySalarySobIds(ids);
sqlSession.commit();
} finally {
sqlSession.close();
}
}
}

2
src/com/engine/salary/entity/salarysob/bo/SalarySobDuplicateBO.java
View File

@ -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)

10
src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.java
View File

@ -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<Long> getById(SalarySobItemHidePO salarySobPO);
/***
* @description 删除薪资账套的薪资项目隐藏信息
* @return void
* @author Harryxzy
* @date 2022/9/22 9:14
*/
void deleteBySalarySobIds(@Param("ids") Collection<Long> ids);
}

9
src/com/engine/salary/mapper/salarysob/SalarySobItemHideMapper.xml
View File

@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.engine.salary.mapper.salarysob.SalarySobItemHideMapper">
<delete id="deleteBySalarySobIds">
delete from hrsa_salary_item_hide
WHERE delete_type = 0
AND salary_sob_id IN
<foreach collection="ids" open="(" item="salarySobId" separator="," close=")">
#{salarySobId}
</foreach>
</delete>
<!-- 根据账套id获取关闭显示开关的itemID -->

2
src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.java
View File

@ -108,4 +108,6 @@ public interface SalarySobItemMapper {
* @param
*/
List<SalarySobItemPO> listBySalarySobIdAndGroupId(@Param("salarySobId") Long salarySobId,@Param("salarySobItemGroupIds") Collection<Long> salarySobItemGroupIds);
}

1
src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
View File

@ -435,4 +435,5 @@
</insert>
</mapper>

61
src/com/engine/salary/service/impl/SalarySobServiceImpl.java
View File

@ -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<SalarySobEmpFieldPO> salarySobEmpFieldPOS = salarySobEmpFieldService.listSome(SalarySobEmpFieldPO.builder().salarySobId(duplicateParam.getId()).build());
// 查询薪资账套的薪资项目副本
List<SalarySobItemPO> salarySobItemPOS = salarySobItemService.listSome(SalarySobItemPO.builder().salarySobId(duplicateParam.getId()).build());
List<SalarySobItemPO> salarySobItemPOS = salarySobItemService.listBySalarySobIdWithHideItem(SalarySobItemPO.builder().salarySobId(duplicateParam.getId()).build());
// 查询薪资账套的薪资项目分类
List<SalarySobItemGroupPO> salarySobItemGroupPOS = salarySobItemGroupService.listSome(SalarySobItemGroupPO.builder().salarySobId(duplicateParam.getId()).build());
List<SalarySobItemGroupPO> salarySobItemGroupPOS = salarySobItemGroupService.listSomeWithItemHide(SalarySobItemGroupPO.builder().salarySobId(duplicateParam.getId()).build());
// 查询薪资账套的调薪计薪规则
List<SalarySobAdjustRulePO> 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<SalarySobItemPO> 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<SalarySobItemGroupPO> 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());