mirror of https://gitee.com/stylefeng/roses
【7.6.0】【hr】格式化代码
parent
164af552cd
commit
eababfda8c
|
@ -21,11 +21,7 @@ import org.springframework.stereotype.Service;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import java.util.ArrayList;
|
import java.util.*;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Set;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -62,14 +58,13 @@ public class HrOrgApproverServiceImpl extends ServiceImpl<HrOrgApproverMapper, H
|
||||||
LambdaQueryWrapper<HrOrgApprover> hrOrgApproverLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<HrOrgApprover> hrOrgApproverLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||||
hrOrgApproverLambdaQueryWrapper.eq(HrOrgApprover::getOrgId, hrOrgApproverRequest.getOrgId());
|
hrOrgApproverLambdaQueryWrapper.eq(HrOrgApprover::getOrgId, hrOrgApproverRequest.getOrgId());
|
||||||
List<HrOrgApprover> orgTotalBindingList = this.list(hrOrgApproverLambdaQueryWrapper);
|
List<HrOrgApprover> orgTotalBindingList = this.list(hrOrgApproverLambdaQueryWrapper);
|
||||||
|
|
||||||
// 将每个类型的用户分组,key是审批组类型,value是该组下的用户
|
// 将每个类型的用户分组,key是审批组类型,value是该组下的用户
|
||||||
Map<Integer, List<HrOrgApprover>> groupingByUsers=new HashMap<>();
|
Map<Integer, List<HrOrgApprover>> groupingByUsers = new HashMap<>();
|
||||||
if (ObjectUtil.isNotEmpty(orgTotalBindingList)) {
|
if (ObjectUtil.isNotEmpty(orgTotalBindingList)) {
|
||||||
groupingByUsers = orgTotalBindingList.stream()
|
groupingByUsers = orgTotalBindingList.stream().collect(Collectors.groupingBy(HrOrgApprover::getOrgApproverType));
|
||||||
.collect(Collectors.groupingBy(HrOrgApprover::getOrgApproverType));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 先初始化空的绑定情况列表
|
// 先初始化空的绑定情况列表
|
||||||
ArrayList<HrOrgApprover> resultList = new ArrayList<>();
|
ArrayList<HrOrgApprover> resultList = new ArrayList<>();
|
||||||
|
@ -80,14 +75,14 @@ public class HrOrgApproverServiceImpl extends ServiceImpl<HrOrgApproverMapper, H
|
||||||
hrOrgApprover.setOrgApproverType(Convert.toInt(orgApproverType.getCode()));
|
hrOrgApprover.setOrgApproverType(Convert.toInt(orgApproverType.getCode()));
|
||||||
|
|
||||||
if (ObjectUtil.isNotEmpty(orgTotalBindingList)) {
|
if (ObjectUtil.isNotEmpty(orgTotalBindingList)) {
|
||||||
// 设置该类型下的审批人列表
|
// 设置该类型下的审批人列表
|
||||||
List<HrOrgApprover> userList = groupingByUsers.get(hrOrgApprover.getOrgApproverType());
|
List<HrOrgApprover> userList = groupingByUsers.get(hrOrgApprover.getOrgApproverType());
|
||||||
if (ObjectUtil.isNotEmpty(userList)) {
|
if (ObjectUtil.isNotEmpty(userList)) {
|
||||||
List<ApproverBindUserItem> bindUserItems = OrgApproverFactory.convertUserItem(userList);
|
List<ApproverBindUserItem> bindUserItems = OrgApproverFactory.convertUserItem(userList);
|
||||||
hrOrgApprover.setBindUserItemList(bindUserItems);
|
hrOrgApprover.setBindUserItemList(bindUserItems);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
resultList.add(hrOrgApprover);
|
resultList.add(hrOrgApprover);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue