!30 包名更改

Merge pull request !30 from dxfeng/feature/dxf
pull/31/MERGE
dxfeng 3 years ago committed by Gitee
commit 46e7a57b5e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

@ -1,9 +1,9 @@
package com.engine.organization.entity.comp.bo;
package com.engine.organization.entity.company.bo;
import com.api.hrm.bean.TreeNode;
import com.engine.organization.entity.comp.dto.CompListDTO;
import com.engine.organization.entity.comp.param.CompSearchParam;
import com.engine.organization.entity.comp.po.CompPO;
import com.engine.organization.entity.company.dto.CompListDTO;
import com.engine.organization.entity.company.param.CompSearchParam;
import com.engine.organization.entity.company.po.CompPO;
import com.engine.organization.entity.searchtree.SearchTree;
import org.apache.commons.collections.CollectionUtils;
import weaver.crm.Maint.SectorInfoComInfo;
@ -21,9 +21,9 @@ import java.util.stream.Collectors;
*/
public class CompBO {
public static List<CompListDTO> buildCompDTOList(Collection<CompPO> list) {
public static List<CompListDTO> buildCompDTOList(Collection<com.engine.organization.entity.company.po.CompPO> list) {
Map<Long, CompPO> poMaps = list.stream().collect(Collectors.toMap(item -> item.getId(), item -> item));
Map<Long, com.engine.organization.entity.company.po.CompPO> poMaps = list.stream().collect(Collectors.toMap(item -> item.getId(), item -> item));
List<CompListDTO> dtoList = list.stream().map(e -> CompListDTO.builder().id(e.getId()).compNo(e.getCompNo()).compName(e.getCompName()).compNameShort(e.getCompNameShort()).parentCompany(e.getParentCompany()).parentCompName(null == poMaps.get(e.getParentCompany()) ? "" : poMaps.get(e.getParentCompany()).getCompName()).orgCode(e.getOrgCode()).industry(new SectorInfoComInfo().getSectorInfoname(e.getIndustry() + "")).compPrincipal(getUserNameById(e.getCompPrincipal() + "")).forbiddenTag(e.getForbiddenTag()).build()).collect(Collectors.toList());
Map<Long, List<CompListDTO>> collects = dtoList.stream().filter(item -> null != item.getParentCompany() && 0 != item.getParentCompany()).collect(Collectors.groupingBy(CompListDTO::getParentCompany));
@ -33,15 +33,15 @@ public class CompBO {
}).filter(item -> null == item.getParentCompany() || 0 == item.getParentCompany()).collect(Collectors.toList());
}
public static List<CompListDTO> buildCompDTOList(Collection<CompPO> list, List<CompPO> filterList) {
public static List<CompListDTO> buildCompDTOList(Collection<com.engine.organization.entity.company.po.CompPO> list, List<com.engine.organization.entity.company.po.CompPO> filterList) {
// 搜索结果为空,直接返回空
if (CollectionUtils.isEmpty(filterList)) {
return Collections.emptyList();
}
// 递归添加父级数据
Map<Long, CompPO> poMaps = list.stream().collect(Collectors.toMap(item -> item.getId(), item -> item));
List<CompPO> addedList = new ArrayList<>();
for (CompPO po : filterList) {
Map<Long, com.engine.organization.entity.company.po.CompPO> poMaps = list.stream().collect(Collectors.toMap(item -> item.getId(), item -> item));
List<com.engine.organization.entity.company.po.CompPO> addedList = new ArrayList<>();
for (com.engine.organization.entity.company.po.CompPO po : filterList) {
dealParentData(addedList, po, poMaps);
}
@ -53,15 +53,15 @@ public class CompBO {
}).filter(item -> null == item.getParentCompany() || 0 == item.getParentCompany()).collect(Collectors.toList());
}
public static CompPO convertParamToPO(CompSearchParam param, Long employeeId) {
public static com.engine.organization.entity.company.po.CompPO convertParamToPO(CompSearchParam param, Long employeeId) {
if (null == param) {
return null;
}
return CompPO.builder().id(param.getId() == null ? 0 : param.getId()).compNo(param.getCompNo()).compName(param.getCompName()).compNameShort(param.getCompNameShort()).parentCompany(param.getParentCompany()).orgCode(param.getOrgCode()).industry(param.getIndustry()).compPrincipal(param.getCompPrincipal()).description(param.getDescription()).forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1).deleteType(0).createTime(new Date()).updateTime(new Date()).creator(employeeId).build();
return com.engine.organization.entity.company.po.CompPO.builder().id(param.getId() == null ? 0 : param.getId()).compNo(param.getCompNo()).compName(param.getCompName()).compNameShort(param.getCompNameShort()).parentCompany(param.getParentCompany()).orgCode(param.getOrgCode()).industry(param.getIndustry()).compPrincipal(param.getCompPrincipal()).description(param.getDescription()).forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 0 : 1).deleteType(0).createTime(new Date()).updateTime(new Date()).creator(employeeId).build();
}
public static List<TreeNode> buildSetToSearchTree(Set<CompPO> comps) {
public static List<TreeNode> buildSetToSearchTree(Set<com.engine.organization.entity.company.po.CompPO> comps) {
return comps.stream().map(item -> {
SearchTree tree = new SearchTree();
tree.setCanClick(true);
@ -85,7 +85,7 @@ public class CompBO {
* @param po
* @param poMaps
*/
private static void dealParentData(List<CompPO> addedList, CompPO po, Map<Long, CompPO> poMaps) {
private static void dealParentData(List<com.engine.organization.entity.company.po.CompPO> addedList, com.engine.organization.entity.company.po.CompPO po, Map<Long, com.engine.organization.entity.company.po.CompPO> poMaps) {
if (!addedList.contains(po)) {
addedList.add(po);
}

@ -1,4 +1,4 @@
package com.engine.organization.entity.comp.dto;
package com.engine.organization.entity.company.dto;
import com.cloudstore.eccom.pc.table.WeaTableType;
import com.engine.organization.annotation.OrganizationTable;

@ -1,4 +1,4 @@
package com.engine.organization.entity.comp.param;
package com.engine.organization.entity.company.param;
import com.engine.organization.common.BaseQueryParam;
import lombok.AllArgsConstructor;

@ -1,4 +1,4 @@
package com.engine.organization.entity.comp.po;
package com.engine.organization.entity.company.po;
import lombok.AllArgsConstructor;
import lombok.Builder;

@ -1,6 +1,6 @@
package com.engine.organization.entity.post.dto;
package com.engine.organization.entity.postion.dto;
import com.engine.organization.entity.post.po.PostPO;
import com.engine.organization.entity.postion.po.PostPO;
import java.util.Date;

@ -1,7 +1,7 @@
package com.engine.organization.entity.post.dto;
package com.engine.organization.entity.postion.dto;
import com.engine.organization.entity.post.param.PostInfoSearchParam;
import com.engine.organization.entity.post.po.PostInfoPO;
import com.engine.organization.entity.postion.param.PostInfoSearchParam;
import com.engine.organization.entity.postion.po.PostInfoPO;
import java.util.Date;

@ -1,4 +1,4 @@
package com.engine.organization.entity.post.param;
package com.engine.organization.entity.postion.param;
import lombok.AllArgsConstructor;
import lombok.Builder;

@ -1,4 +1,4 @@
package com.engine.organization.entity.post.po;
package com.engine.organization.entity.postion.po;
import lombok.AllArgsConstructor;
import lombok.Builder;

@ -1,4 +1,4 @@
package com.engine.organization.entity.post.po;
package com.engine.organization.entity.postion.po;
import lombok.AllArgsConstructor;
import lombok.Builder;

@ -1,4 +1,4 @@
package com.engine.organization.entity.post.vo;
package com.engine.organization.entity.postion.vo;
import com.engine.organization.annotation.OrganizationTable;
import com.engine.organization.annotation.OrganizationTableColumn;

@ -1,6 +1,6 @@
package com.engine.organization.mapper.comp;
import com.engine.organization.entity.comp.po.CompPO;
import com.engine.organization.entity.company.po.CompPO;
import org.apache.ibatis.annotations.Param;
import java.util.Collection;

@ -1,7 +1,7 @@
<?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.organization.mapper.comp.CompMapper">
<resultMap id="BaseResultMap" type="com.engine.organization.entity.comp.po.CompPO">
<resultMap id="BaseResultMap" type="com.engine.organization.entity.company.po.CompPO">
<result column="id" property="id"/>
<result column="comp_no" property="compNo"/>
<result column="comp_name" property="compName"/>
@ -50,7 +50,7 @@
and NVL(parent_company,'0')='0'
</sql>
<insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.comp.po.CompPO" keyProperty="id"
<insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.company.po.CompPO" keyProperty="id"
keyColumn="id" useGeneratedKeys="true">
INSERT INTO jcl_org_comp
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -171,12 +171,12 @@
and id = #{id}
</select>
<select id="listByNo" parameterType="com.engine.organization.entity.comp.po.CompPO" resultMap="BaseResultMap">
<select id="listByNo" parameterType="com.engine.organization.entity.company.po.CompPO" resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from jcl_org_comp t where comp_no = #{compNo} AND delete_type = 0
</select>
<select id="listByFilter" parameterType="com.engine.organization.entity.comp.po.CompPO" resultMap="BaseResultMap">
<select id="listByFilter" parameterType="com.engine.organization.entity.company.po.CompPO" resultMap="BaseResultMap">
SELECT
<include refid="baseColumns"/>
FROM
@ -252,7 +252,7 @@
</foreach>
</update>
<update id="updateBaseComp" parameterType="com.engine.organization.entity.comp.po.CompPO">
<update id="updateBaseComp" parameterType="com.engine.organization.entity.company.po.CompPO">
update jcl_org_comp
<set>
creator=#{creator},

@ -1,7 +1,7 @@
package com.engine.organization.mapper.post;
import com.engine.organization.entity.post.po.PostInfoPO;
import com.engine.organization.entity.postion.po.PostInfoPO;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;

@ -1,7 +1,7 @@
<?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.organization.mapper.post.PostInfoMapper">
<resultMap id="BaseResultMap" type="com.engine.organization.entity.post.po.PostInfoPO">
<resultMap id="BaseResultMap" type="com.engine.organization.entity.postion.po.PostInfoPO">
<result column="id" property="id"/>
<result column="post_info_no" property="postInfoNo"/>
<result column="post_info_name" property="postInfoName"/>
@ -35,14 +35,14 @@
, t.create_time
, t.update_time
</sql>
<select id="getPostInfoByID" parameterType="com.engine.organization.entity.post.po.PostInfoPO"
<select id="getPostInfoByID" parameterType="com.engine.organization.entity.postion.po.PostInfoPO"
resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from jcl_org_post_info t where id = #{id} AND delete_type = 0
</select>
<select id="listByNo" parameterType="com.engine.organization.entity.post.po.PostInfoPO"
<select id="listByNo" parameterType="com.engine.organization.entity.postion.po.PostInfoPO"
resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
@ -61,7 +61,7 @@
</foreach>
</select>
<update id="updatePostInfo" parameterType="com.engine.organization.entity.post.po.PostInfoPO">
<update id="updatePostInfo" parameterType="com.engine.organization.entity.postion.po.PostInfoPO">
update jcl_org_post_info
<set>
creator=#{creator},
@ -77,7 +77,7 @@
WHERE id = #{id} AND delete_type = 0
</update>
<insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.post.po.PostInfoPO" keyProperty="id"
<insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.postion.po.PostInfoPO" keyProperty="id"
keyColumn="id" useGeneratedKeys="true">
INSERT INTO jcl_org_post_info
<trim prefix="(" suffix=")" suffixOverrides=",">
@ -154,7 +154,7 @@
</trim>
</insert>
<update id="updateForbiddenTagById" parameterType="com.engine.organization.entity.post.po.PostInfoPO">
<update id="updateForbiddenTagById" parameterType="com.engine.organization.entity.postion.po.PostInfoPO">
update jcl_org_post_info
<set>
forbidden_tag=#{forbiddenTag},

@ -2,7 +2,7 @@ package com.engine.organization.mapper.post;
import com.engine.organization.entity.TreeData;
import com.engine.organization.entity.post.po.PostPO;
import com.engine.organization.entity.postion.po.PostPO;
import org.apache.ibatis.annotations.MapKey;
import org.apache.ibatis.annotations.Param;

@ -1,7 +1,7 @@
<?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.organization.mapper.post.PostMapper">
<resultMap id="BaseResultMap" type="com.engine.organization.entity.post.po.PostPO">
<resultMap id="BaseResultMap" type="com.engine.organization.entity.postion.po.PostPO">
<result column="id" property="id"/>
<result column="post_no" property="postNo"/>
<result column="post_name" property="postName"/>
@ -30,14 +30,14 @@
, t.create_time
, t.update_time
</sql>
<select id="getPostByID" parameterType="com.engine.organization.entity.post.po.PostPO"
<select id="getPostByID" parameterType="com.engine.organization.entity.postion.po.PostPO"
resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from jcl_org_post t where id = #{id} AND delete_type = 0
</select>
<select id="listByNo" parameterType="com.engine.organization.entity.post.po.PostPO" resultMap="BaseResultMap">
<select id="listByNo" parameterType="com.engine.organization.entity.postion.po.PostPO" resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from jcl_org_post t where post_no = #{postNo} AND delete_type = 0
@ -61,7 +61,7 @@
select id , post_name from jcl_org_post where delete_type ='0'
</select>
<update id="updatePost" parameterType="com.engine.organization.entity.post.po.PostPO">
<update id="updatePost" parameterType="com.engine.organization.entity.postion.po.PostPO">
update jcl_org_post
<set>
creator=#{creator},
@ -73,7 +73,7 @@
WHERE id = #{id} AND delete_type = 0
</update>
<insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.post.po.PostPO" keyProperty="id"
<insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.postion.po.PostPO" keyProperty="id"
keyColumn="id" useGeneratedKeys="true">
INSERT INTO jcl_org_post
<trim prefix="(" suffix=")" suffixOverrides=",">

@ -1,6 +1,6 @@
package com.engine.organization.service;
import com.engine.organization.entity.comp.param.CompSearchParam;
import com.engine.organization.entity.company.param.CompSearchParam;
import java.util.Collection;
import java.util.Map;

@ -1,6 +1,6 @@
package com.engine.organization.service;
import com.engine.organization.entity.post.param.PostInfoSearchParam;
import com.engine.organization.entity.postion.param.PostInfoSearchParam;
import java.util.Collection;
import java.util.Map;

@ -1,7 +1,7 @@
package com.engine.organization.service;
import com.engine.organization.entity.TreeData;
import com.engine.organization.entity.post.po.PostPO;
import com.engine.organization.entity.postion.po.PostPO;
import java.util.Collection;
import java.util.Map;

@ -11,10 +11,10 @@ import com.cloudstore.eccom.result.WeaResultMsg;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.organization.component.OrganizationWeaTable;
import com.engine.organization.entity.comp.bo.CompBO;
import com.engine.organization.entity.comp.dto.CompListDTO;
import com.engine.organization.entity.comp.param.CompSearchParam;
import com.engine.organization.entity.comp.po.CompPO;
import com.engine.organization.entity.company.bo.CompBO;
import com.engine.organization.entity.company.dto.CompListDTO;
import com.engine.organization.entity.company.param.CompSearchParam;
import com.engine.organization.entity.company.po.CompPO;
import com.engine.organization.mapper.comp.CompMapper;
import com.engine.organization.mapper.extend.ExtendGroupMapper;
import com.engine.organization.service.CompService;

@ -12,8 +12,8 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.organization.component.OrganizationWeaTable;
import com.engine.organization.entity.QueryParam;
import com.engine.organization.entity.comp.bo.CompBO;
import com.engine.organization.entity.comp.po.CompPO;
import com.engine.organization.entity.company.bo.CompBO;
import com.engine.organization.entity.company.po.CompPO;
import com.engine.organization.entity.department.bo.DepartmentBO;
import com.engine.organization.entity.department.dto.DepartmentListDTO;
import com.engine.organization.entity.department.po.DepartmentPO;

@ -7,10 +7,10 @@ import com.cloudstore.eccom.result.WeaResultMsg;
import com.engine.core.impl.Service;
import com.engine.organization.component.OrganizationWeaTable;
import com.engine.organization.entity.QueryParam;
import com.engine.organization.entity.post.dto.PostInfoDTO;
import com.engine.organization.entity.post.param.PostInfoSearchParam;
import com.engine.organization.entity.post.po.PostInfoPO;
import com.engine.organization.entity.post.vo.PostInfoTableVO;
import com.engine.organization.entity.postion.dto.PostInfoDTO;
import com.engine.organization.entity.postion.param.PostInfoSearchParam;
import com.engine.organization.entity.postion.po.PostInfoPO;
import com.engine.organization.entity.postion.vo.PostInfoTableVO;
import com.engine.organization.mapper.post.PostInfoMapper;
import com.engine.organization.mapper.post.PostMapper;
import com.engine.organization.service.PostInfoService;

@ -4,8 +4,8 @@ import com.api.browser.bean.SearchConditionGroup;
import com.api.browser.bean.SearchConditionItem;
import com.engine.core.impl.Service;
import com.engine.organization.entity.TreeData;
import com.engine.organization.entity.post.dto.PostDTO;
import com.engine.organization.entity.post.po.PostPO;
import com.engine.organization.entity.postion.dto.PostDTO;
import com.engine.organization.entity.postion.po.PostPO;
import com.engine.organization.mapper.post.PostMapper;
import com.engine.organization.service.PostService;
import com.engine.organization.util.OrganizationAssert;

@ -3,7 +3,7 @@ package com.engine.organization.web;
import com.engine.common.util.ParamUtil;
import com.engine.common.util.ServiceUtil;
import com.engine.organization.entity.QueryParam;
import com.engine.organization.entity.comp.param.CompSearchParam;
import com.engine.organization.entity.company.param.CompSearchParam;
import com.engine.organization.util.response.ReturnResult;
import com.engine.organization.wrapper.CompWrapper;
import io.swagger.v3.oas.annotations.parameters.RequestBody;

@ -3,7 +3,7 @@ package com.engine.organization.web;
import com.engine.common.util.ParamUtil;
import com.engine.common.util.ServiceUtil;
import com.engine.organization.entity.QueryParam;
import com.engine.organization.entity.post.po.PostPO;
import com.engine.organization.entity.postion.po.PostPO;
import com.engine.organization.util.response.ReturnResult;
import com.engine.organization.wrapper.PostWrapper;
import io.swagger.v3.oas.annotations.parameters.RequestBody;

@ -3,7 +3,7 @@ package com.engine.organization.web;
import com.engine.common.util.ParamUtil;
import com.engine.common.util.ServiceUtil;
import com.engine.organization.entity.QueryParam;
import com.engine.organization.entity.post.param.PostInfoSearchParam;
import com.engine.organization.entity.postion.param.PostInfoSearchParam;
import com.engine.organization.util.response.ReturnResult;
import com.engine.organization.wrapper.PostInfoWrapper;
import io.swagger.v3.oas.annotations.parameters.RequestBody;

@ -1,6 +1,6 @@
package com.engine.organization.webservice;
import com.engine.organization.entity.comp.po.CompPO;
import com.engine.organization.entity.company.po.CompPO;
import javax.jws.WebMethod;
import javax.jws.WebService;

@ -1,6 +1,6 @@
package com.engine.organization.webservice;
import com.engine.organization.entity.comp.po.CompPO;
import com.engine.organization.entity.company.po.CompPO;
import com.engine.organization.mapper.comp.CompMapper;
import com.engine.organization.util.db.MapperProxyFactory;
import org.apache.commons.collections4.CollectionUtils;

@ -2,7 +2,7 @@ package com.engine.organization.wrapper;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.organization.entity.comp.param.CompSearchParam;
import com.engine.organization.entity.company.param.CompSearchParam;
import com.engine.organization.service.CompService;
import com.engine.organization.service.impl.CompServiceImpl;
import weaver.hrm.User;

@ -2,7 +2,7 @@ package com.engine.organization.wrapper;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.organization.entity.post.param.PostInfoSearchParam;
import com.engine.organization.entity.postion.param.PostInfoSearchParam;
import com.engine.organization.service.PostInfoService;
import com.engine.organization.service.impl.PostInfoServiceImpl;
import org.apache.ibatis.annotations.Param;

@ -3,7 +3,7 @@ package com.engine.organization.wrapper;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.organization.entity.TreeData;
import com.engine.organization.entity.post.po.PostPO;
import com.engine.organization.entity.postion.po.PostPO;
import com.engine.organization.service.PostService;
import com.engine.organization.service.impl.PostServiceImpl;
import org.apache.ibatis.annotations.Param;

Loading…
Cancel
Save