|
|
|
|
@ -5,7 +5,6 @@ import com.api.browser.bean.BrowserBean;
|
|
|
|
|
import com.api.browser.bean.SearchConditionGroup;
|
|
|
|
|
import com.api.browser.bean.SearchConditionItem;
|
|
|
|
|
import com.api.browser.bean.SearchConditionOption;
|
|
|
|
|
import com.api.hrm.bean.TreeNode;
|
|
|
|
|
import com.cloudstore.eccom.pc.table.WeaTableColumn;
|
|
|
|
|
import com.cloudstore.eccom.result.WeaResultMsg;
|
|
|
|
|
import com.engine.common.util.ServiceUtil;
|
|
|
|
|
@ -49,8 +48,8 @@ import com.engine.organization.util.db.MapperProxyFactory;
|
|
|
|
|
import com.engine.organization.util.page.Column;
|
|
|
|
|
import com.engine.organization.util.page.PageInfo;
|
|
|
|
|
import com.engine.organization.util.page.PageUtil;
|
|
|
|
|
import com.engine.organization.util.tree.SearchTreeUtil;
|
|
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
|
|
import weaver.conn.RecordSet;
|
|
|
|
|
import weaver.general.StringUtil;
|
|
|
|
|
import weaver.general.Util;
|
|
|
|
|
import weaver.hrm.User;
|
|
|
|
|
@ -73,7 +72,6 @@ public class JobServiceImpl extends Service implements JobService {
|
|
|
|
|
* 1：分部
|
|
|
|
|
* 2：部门
|
|
|
|
|
*/
|
|
|
|
|
private static final String TYPE_GROUP = "0";
|
|
|
|
|
private static final String TYPE_COMP = "1";
|
|
|
|
|
private static final String TYPE_DEPT = "2";
|
|
|
|
|
|
|
|
|
|
@ -128,31 +126,11 @@ public class JobServiceImpl extends Service implements JobService {
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public Map<String, Object> getSearchTree(SearchTreeParams params) {
|
|
|
|
|
Map<String, Object> dataMap = new HashMap<>();
|
|
|
|
|
SearchTree topGroup = getTopGroup();
|
|
|
|
|
// 集团
|
|
|
|
|
List<SearchTree> companyList = new ArrayList<>();
|
|
|
|
|
companyList.add(topGroup);
|
|
|
|
|
String keyword = params.getKeyword();
|
|
|
|
|
String type = Util.null2String(params.getType());
|
|
|
|
|
String id = params.getId();
|
|
|
|
|
|
|
|
|
|
List<TreeNode> treeDatas = getFilterCompany(id, type, keyword);
|
|
|
|
|
// 未点击，初始化树结构
|
|
|
|
|
if (StringUtil.isEmpty(type)) {
|
|
|
|
|
dataMap.put("companys", companyList);
|
|
|
|
|
SearchTree rootCompany = getTopGroup();
|
|
|
|
|
rootCompany.setSubs(treeDatas);
|
|
|
|
|
rootCompany.setIsParent(CollectionUtils.isNotEmpty(rootCompany.getSubs()));
|
|
|
|
|
Map<String, Object> rootCompanyMap = new HashMap<>();
|
|
|
|
|
rootCompanyMap.put("rootCompany", rootCompany);
|
|
|
|
|
dataMap.put("datas", rootCompanyMap);
|
|
|
|
|
} else {
|
|
|
|
|
// 根据ID查询
|
|
|
|
|
dataMap.put("datas", treeDatas);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return dataMap;
|
|
|
|
|
String type = Util.null2String(params.getType());
|
|
|
|
|
List<SearchTree> treeList = getFilterCompany(id, type, keyword);
|
|
|
|
|
return SearchTreeUtil.getSearchTree(type, treeList);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
@ -444,8 +422,13 @@ public class JobServiceImpl extends Service implements JobService {
|
|
|
|
|
List<Long> idList = Arrays.stream(ids.split(",")).map(Long::parseLong).collect(Collectors.toList());
|
|
|
|
|
for (Long id : idList) {
|
|
|
|
|
JobPO jobById = getJobMapper().getJobById(id);
|
|
|
|
|
// TODO 自动编号
|
|
|
|
|
jobById.setJobNo("复制_" + jobById.getJobNo());
|
|
|
|
|
try {
|
|
|
|
|
// 处理自动编号
|
|
|
|
|
jobById.setJobNo(CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType.
|
|
|
|
|
JOBTITLES, ""));
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
throw new RuntimeException(e);
|
|
|
|
|
}
|
|
|
|
|
jobById.setParentDept(Long.parseLong(department));
|
|
|
|
|
insertCount += getJobMapper().insertIgnoreNull(jobById);
|
|
|
|
|
}
|
|
|
|
|
@ -485,7 +468,7 @@ public class JobServiceImpl extends Service implements JobService {
|
|
|
|
|
*/
|
|
|
|
|
private void buildParentDepts(DepartmentPO departmentPO, Set<DepartmentPO> builderDeparts) {
|
|
|
|
|
builderDeparts.add(departmentPO);
|
|
|
|
|
if (isTop(departmentPO.getParentDept())) {
|
|
|
|
|
if (SearchTreeUtil.isTop(departmentPO.getParentDept())) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
DepartmentPO parentDept = getDepartmentMapper().getDeptById(departmentPO.getParentDept());
|
|
|
|
|
@ -502,7 +485,7 @@ public class JobServiceImpl extends Service implements JobService {
|
|
|
|
|
*/
|
|
|
|
|
private void buildParentComps(CompPO compPO, Set<CompPO> builderComps) {
|
|
|
|
|
builderComps.add(compPO);
|
|
|
|
|
if (isTop(compPO.getParentCompany())) {
|
|
|
|
|
if (SearchTreeUtil.isTop(compPO.getParentCompany())) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
CompPO parentComp = getCompMapper().listById(compPO.getParentCompany());
|
|
|
|
|
@ -511,30 +494,6 @@ public class JobServiceImpl extends Service implements JobService {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 获取集团
|
|
|
|
|
*
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
private SearchTree getTopGroup() {
|
|
|
|
|
RecordSet rs = new RecordSet();
|
|
|
|
|
String sql = "select * from HrmCompany ";
|
|
|
|
|
rs.executeQuery(sql);
|
|
|
|
|
SearchTree groupTree = new SearchTree();
|
|
|
|
|
groupTree.setCanClick(false);
|
|
|
|
|
groupTree.setCanceled(false);
|
|
|
|
|
groupTree.setCompanyid("1");
|
|
|
|
|
groupTree.setIcon("icon-coms-LargeArea");
|
|
|
|
|
groupTree.setId("0");
|
|
|
|
|
groupTree.setIsVirtual("0");
|
|
|
|
|
while (rs.next()) {
|
|
|
|
|
groupTree.setName(rs.getString("COMPANYNAME"));
|
|
|
|
|
}
|
|
|
|
|
groupTree.setSelected(false);
|
|
|
|
|
groupTree.setType(TYPE_GROUP);
|
|
|
|
|
return groupTree;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 根据keyword查询数据
|
|
|
|
|
*
|
|
|
|
|
@ -543,14 +502,14 @@ public class JobServiceImpl extends Service implements JobService {
|
|
|
|
|
* @param keyword
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
private List<TreeNode> getFilterCompany(String id, String type, String keyword) {
|
|
|
|
|
List<TreeNode> compSearchTree = new ArrayList<>();
|
|
|
|
|
private List<SearchTree> getFilterCompany(String id, String type, String keyword) {
|
|
|
|
|
List<SearchTree> searchTree = new ArrayList<>();
|
|
|
|
|
// 通过分部、公司 组装数据
|
|
|
|
|
if (StringUtil.isEmpty(id) || TYPE_COMP.equals(type)) {
|
|
|
|
|
Long parentCompId = StringUtil.isEmpty(id) ? null : Long.parseLong(id);
|
|
|
|
|
DepartmentPO departmentBuild = DepartmentPO.builder().deptName(keyword).parentComp(parentCompId).build();
|
|
|
|
|
CompPO compBuild = CompPO.builder().compName(keyword).parentCompany(parentCompId).build();
|
|
|
|
|
buildTreeByCompAndDept(departmentBuild, compBuild, compSearchTree);
|
|
|
|
|
searchTree = buildTreeByCompAndDept(departmentBuild, compBuild);
|
|
|
|
|
} else if (TYPE_DEPT.equals(type)) {
|
|
|
|
|
//
|
|
|
|
|
// 查询部门信息
|
|
|
|
|
@ -559,16 +518,10 @@ public class JobServiceImpl extends Service implements JobService {
|
|
|
|
|
for (DepartmentPO departmentPO : filterDeparts) {
|
|
|
|
|
buildParentDepts(departmentPO, builderDeparts);
|
|
|
|
|
}
|
|
|
|
|
List<SearchTree> deptTrees = builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts));
|
|
|
|
|
// 排序，设置是否为叶子节点
|
|
|
|
|
List<TreeNode> collect = deptTrees.stream().peek(item ->
|
|
|
|
|
item.setIsParent(CollectionUtils.isNotEmpty(item.getSubs()))
|
|
|
|
|
).sorted(Comparator.comparing(item -> Integer.parseInt(item.getId()))).collect(Collectors.toList());
|
|
|
|
|
if (CollectionUtils.isNotEmpty(collect)) {
|
|
|
|
|
compSearchTree.addAll(collect);
|
|
|
|
|
}
|
|
|
|
|
searchTree = SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts));
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
return compSearchTree;
|
|
|
|
|
return searchTree;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
@ -576,9 +529,9 @@ public class JobServiceImpl extends Service implements JobService {
|
|
|
|
|
*
|
|
|
|
|
* @param departmentBuild
|
|
|
|
|
* @param compBuild
|
|
|
|
|
* @param compSearchTree
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
private void buildTreeByCompAndDept(DepartmentPO departmentBuild, CompPO compBuild, List<TreeNode> compSearchTree) {
|
|
|
|
|
private List<SearchTree> buildTreeByCompAndDept(DepartmentPO departmentBuild, CompPO compBuild) {
|
|
|
|
|
List<DepartmentPO> filterDeparts = getDepartmentMapper().listByFilter(departmentBuild);
|
|
|
|
|
// 查询分部信息
|
|
|
|
|
List<CompPO> filterComps = getCompMapper().listByFilter(compBuild);
|
|
|
|
|
@ -586,7 +539,7 @@ public class JobServiceImpl extends Service implements JobService {
|
|
|
|
|
for (DepartmentPO departmentPO : filterDeparts) {
|
|
|
|
|
buildParentDepts(departmentPO, builderDeparts);
|
|
|
|
|
}
|
|
|
|
|
List<SearchTree> deptTrees = builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts));
|
|
|
|
|
List<SearchTree> deptTrees = SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts));
|
|
|
|
|
// 添加部门的上级分部
|
|
|
|
|
String parentCompS = deptTrees.stream().map(SearchTree::getParentComp).collect(Collectors.joining(","));
|
|
|
|
|
if (!StringUtil.isEmpty(parentCompS)) {
|
|
|
|
|
@ -599,80 +552,9 @@ public class JobServiceImpl extends Service implements JobService {
|
|
|
|
|
for (CompPO compPO : filterComps) {
|
|
|
|
|
buildParentComps(compPO, builderComps);
|
|
|
|
|
}
|
|
|
|
|
List<TreeNode> compTrees = builderTreeMode(CompBO.buildSetToSearchTree(builderComps), deptTrees);
|
|
|
|
|
|
|
|
|
|
// 排序，设置是否为叶子节点
|
|
|
|
|
List<TreeNode> collect = compTrees.stream().peek(item ->
|
|
|
|
|
item.setIsParent(CollectionUtils.isNotEmpty(item.getSubs()))
|
|
|
|
|
).sorted(Comparator.comparing(item -> Integer.parseInt(item.getId()))).collect(Collectors.toList());
|
|
|
|
|
if (CollectionUtils.isNotEmpty(collect)) {
|
|
|
|
|
compSearchTree.addAll(collect);
|
|
|
|
|
}
|
|
|
|
|
return SearchTreeUtil.builderTreeMode(CompBO.buildSetToSearchTree(builderComps), deptTrees);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 判断是为顶层数据
|
|
|
|
|
*
|
|
|
|
|
* @param pid
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
private boolean isTop(Long pid) {
|
|
|
|
|
return null == pid;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 判断是为顶层数据
|
|
|
|
|
*
|
|
|
|
|
* @param pid
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
private boolean isTop(String pid) {
|
|
|
|
|
return StringUtil.isEmpty(pid) || "0".equals(pid);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 处理树层级
|
|
|
|
|
*
|
|
|
|
|
* @param treeList
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
private List<SearchTree> builderTreeMode(List<SearchTree> treeList) {
|
|
|
|
|
Map<String, List<TreeNode>> collects = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid));
|
|
|
|
|
return treeList.stream().peek(e -> e.setSubs(collects.get(e.getId()))).peek(item -> {
|
|
|
|
|
if (CollectionUtils.isNotEmpty(item.getSubs())) {
|
|
|
|
|
item.setIsParent(true);
|
|
|
|
|
}
|
|
|
|
|
}).filter(item -> isTop(item.getPid())).collect(Collectors.toList());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 组合分部、部门层级关系
|
|
|
|
|
*
|
|
|
|
|
* @param treeList
|
|
|
|
|
* @param deptTrees
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
private List<TreeNode> builderTreeMode(List<SearchTree> treeList, List<SearchTree> deptTrees) {
|
|
|
|
|
Map<String, List<TreeNode>> parentMap = treeList.stream().collect(Collectors.groupingBy(TreeNode::getPid));
|
|
|
|
|
Map<String, List<SearchTree>> childMap = deptTrees.stream().collect(Collectors.groupingBy(SearchTree::getParentComp));
|
|
|
|
|
boolean isAdd = !childMap.isEmpty();
|
|
|
|
|
return treeList.stream().peek(e -> {
|
|
|
|
|
List<TreeNode> treeNodes = new ArrayList<>();
|
|
|
|
|
List<TreeNode> nodes = parentMap.get(e.getId());
|
|
|
|
|
if (CollectionUtils.isNotEmpty(nodes)) {
|
|
|
|
|
treeNodes.addAll(nodes);
|
|
|
|
|
}
|
|
|
|
|
if (isAdd && CollectionUtils.isNotEmpty(childMap.get(e.getId()))) {
|
|
|
|
|
treeNodes.addAll(childMap.get(e.getId()));
|
|
|
|
|
}
|
|
|
|
|
e.setSubs(treeNodes);
|
|
|
|
|
}).peek(item -> {
|
|
|
|
|
if (CollectionUtils.isNotEmpty(item.getSubs())) {
|
|
|
|
|
item.setIsParent(true);
|
|
|
|
|
}
|
|
|
|
|
}).filter(item -> isTop(item.getPid())).collect(Collectors.toList());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 是否有搜索查询
|
|
|
|
|
|
