liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

人员导入

This commit is contained in:
dxfeng 2022-07-01 14:02:03 +08:00
parent d508a4d9d0
commit fca0bb4dad
12 changed files with 385 additions and 477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/engine/organization/mapper/comp/CompMapper.java
View File

@ -140,4 +140,22 @@ public interface CompMapper {
* @return
*/
int getMaxShowOrder();
/**
* 根据名称和上级查找ID
*
* @param companyName
* @param parentCompany
* @return
*/
Long getIdByNameAndPid(@Param("companyName") String companyName, @Param("parentCompany") Long parentCompany);
/**
* 统计顶层分部个数
*
* @param parentCompany
* @return
*/
Integer countTopCompany(@Param("parentCompany") Long parentCompany);
}

25
src/com/engine/organization/mapper/comp/CompMapper.xml
View File

@ -52,6 +52,21 @@
and NVL(parent_company,'0')='0'
</sql>
<sql id="nullParentCompany">
and ifnull(parent_company,0) =
#{parentCompany}
</sql>
<sql id="nullParentCompany" databaseId="sqlserver">
and isnull(parent_company,0) =
#{parentCompany}
</sql>
<sql id="nullParentCompany" databaseId="oracle">
and NVL(parent_company,0) =
#{parentCompany}
</sql>
<insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.company.po.CompPO" keyProperty="id"
keyColumn="id" useGeneratedKeys="true">
INSERT INTO jcl_org_comp
@ -263,6 +278,16 @@
select max(show_order)
from jcl_org_comp
</select>
<select id="getIdByNameAndPid" resultType="java.lang.Long">
select id
from jcl_org_comp
where delete_type = 0 and comp_name = #{companyName}
<include refid="nullParentCompany"/>
</select>
<select id="countTopCompany" resultType="java.lang.Integer">
select COUNT(id) from jcl_org_comp where 1=1
<include refid="nullParentCompany"/>
</select>
<update id="updateForbiddenTagById" parameterType="com.engine.organization.entity.sequence.po.SequencePO">
update jcl_org_comp

9
src/com/engine/organization/mapper/department/DepartmentMapper.java
View File

@ -114,4 +114,13 @@ public interface DepartmentMapper {
* @return
*/
int getMaxShowOrder();
/**
* 根据名称、上级 查询部门元素
* @param departmentName
* @param parentCompany
* @param parentDepartment
* @return
*/
Long getIdByNameAndPid(@Param("departmentName") String departmentName, @Param("parentCompany") Long parentCompany, @Param("parentDepartment") Long parentDepartment);
}

21
src/com/engine/organization/mapper/department/DepartmentMapper.xml
View File

@ -140,6 +140,27 @@
select max(show_order)
from jcl_org_dept
</select>
<select id="getIdByNameAndPid" resultType="java.lang.Long">
select id
from jcl_org_dept
where delete_type = 0 and dept_name = #{departmentName}
and parent_comp = #{parentCompany}
<include refid="nullParentDepartment"/>
</select>
<sql id="nullParentDepartment">
and ifnull(parent_dept,0) =
#{parentDepartment}
</sql>
<sql id="nullParentDepartment" databaseId="sqlserver">
and isnull(parent_dept,0) =
#{parentDepartment}
</sql>
<sql id="nullParentDepartment" databaseId="oracle">
and NVL(parent_dept,0) =
#{parentDepartment}
</sql>
<insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.department.po.DepartmentPO"
keyProperty="id"

20
src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.java
View File

@ -1,7 +1,10 @@
package com.engine.organization.mapper.hrmresource;
import com.alibaba.fastjson.JSONObject;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @description:
* @author:dxfeng
@ -24,4 +27,21 @@ public interface HrmResourceMapper {
* @return
*/
String getLastNameById(@Param("id") Long id);
/**
* 根据所选关键字段查询ID
*
* @param keyField
* @param keyFieldValue
* @return
*/
Integer getIdByKeyField(@Param("keyField") String keyField, @Param("keyFieldValue") String keyFieldValue);
/**
* 根据所选关键字段，查询关键列
*
* @param keyField
* @return
*/
List<JSONObject> getKeyMapByKetField(@Param("keyField") String keyField);
}

10
src/com/engine/organization/mapper/hrmresource/HrmResourceMapper.xml
View File

@ -32,4 +32,14 @@
where delete_type = 0
and id = #{id}
</select>
<select id="getIdByKeyField" resultType="java.lang.Integer">
select id
from jcl_org_hrmresource
where delete_type = 0
and ${keyField} = #{keyFieldValue}
</select>
<select id="getKeyMapByKetField" resultType="com.alibaba.fastjson.JSONObject">
select id, account_type, certificate_num, login_id, work_code, ${keyField}
from jcl_org_hrmresource
</select>
</mapper>

26
src/com/engine/organization/mapper/hrmresource/SystemDataMapper.java Normal file
View File

@ -0,0 +1,26 @@
package com.engine.organization.mapper.hrmresource;
import com.alibaba.fastjson.JSONObject;
import java.util.List;
/**
* @author:dxfeng
* @createTime: 2022/06/30
* @version: 1.0
*/
public interface SystemDataMapper {
JSONObject getSysLanguageByLicense();
List<JSONObject> getSysLanguageByActivable();
List<JSONObject> getHrmEducationLevelData();
List<JSONObject> getHrmJobCallData();
List<JSONObject> getHrmLocationsByCountryId();
List<JSONObject> getHrmUseKindData();
}

36
src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml Normal file
View File

@ -0,0 +1,36 @@
<?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.hrmresource.SystemDataMapper">
<select id="getSysLanguageByLicense" resultType="com.alibaba.fastjson.JSONObject">
select multilanguage, (select id from syslanguage where language='简体中文' or language='中文') as cnLanguageId
from license
</select>
<select id="getSysLanguageByActivable" resultType="com.alibaba.fastjson.JSONObject">
select id, language
from syslanguage
where activable = 1
</select>
<select id="getHrmEducationLevelData" resultType="com.alibaba.fastjson.JSONObject">
select id, name
from HrmEducationLevel
</select>
<select id="getHrmJobCallData" resultType="com.alibaba.fastjson.JSONObject">
select id, name
from HrmJobCall
</select>
<select id="getHrmLocationsByCountryId" resultType="com.alibaba.fastjson.JSONObject">
select id, locationname
from HrmLocations
where countryid = 1
</select>
<select id="getHrmUseKindData" resultType="com.alibaba.fastjson.JSONObject">
select id, name
from HrmUseKind
</select>
</mapper>

11
src/com/engine/organization/mapper/job/JobMapper.java
View File

@ -131,4 +131,15 @@ public interface JobMapper {
* @return
*/
int getMaxShowOrder();
/**
* 根据名字和上级查询岗位信息
*
* @param jobName
* @param parentCompany
* @param parentDepartment
* @param parentJob
* @return
*/
Long getIdByNameAndPid(@Param("jobName") String jobName, @Param("parentCompany") Long parentCompany, @Param("parentDepartment") Long parentDepartment, @Param("parentJob") Long parentJob);
}

23
src/com/engine/organization/mapper/job/JobMapper.xml
View File

@ -337,6 +337,29 @@
select max(show_order)
from jcl_org_job
</select>
<select id="getIdByNameAndPid" resultType="java.lang.Long">
select id
from jcl_org_job
where delete_type = 0 and job_name = #{jobName}
and parent_comp = #{parentCompany}
and parent_dept = #{parentDepartment}
<include refid="nullparentJob"/>
</select>
<sql id="nullparentJob">
and ifnull(parent_job,0) =
#{parentJob}
</sql>
<sql id="nullparentJob" databaseId="sqlserver">
and isnull(parent_job,0) =
#{parentJob}
</sql>
<sql id="nullparentJob" databaseId="oracle">
and NVL(parent_job,0) =
#{parentJob}
</sql>
<sql id="likeSQL">

4
src/com/engine/organization/util/saveimport/HrmResourceImportAdaptUtil.java
View File

@ -563,7 +563,6 @@ public class HrmResourceImportAdaptUtil {
* @param rowNum 行号
* @param cellNum 列号
* @param cellValue 单元格值
* @return
*/
public boolean valExcelDataFormate(int rowNum, int cellNum, String cellValue) {
@ -867,7 +866,6 @@ public class HrmResourceImportAdaptUtil {
*
* @param cellIndex 列号
* @param rowNum 行号
* @return
*/
public String getCellPosition(int cellIndex, int rowNum) {
@ -957,7 +955,6 @@ public class HrmResourceImportAdaptUtil {
* 获取excel单元格值
*
* @param cell 要读取的单元格对象
* @return
*/
public String getCellValue(Cell cell) {
String cellValue = "";
@ -1007,7 +1004,6 @@ public class HrmResourceImportAdaptUtil {
/**
* 获取指定行、列的单元格值
*
* @param rowNum
* @param cellNum
* @return
*/

659
src/com/engine/organization/util/saveimport/HrmResourceImportProcessUtil.java
View File

File diff suppressed because it is too large Load Diff