This commit is contained in:
2025-12-30 13:47:53 +08:00
parent f1637501b2
commit a623c5673f
137 changed files with 11031 additions and 4043 deletions

View File

@@ -4,8 +4,8 @@
<resultMap id="BaseResultMap" type="com.klp.hrm.domain.HrmEmpOrgPosition">
<id column="rel_id" property="relId"/>
<result column="emp_id" property="empId"/>
<result column="org_id" property="orgId"/>
<result column="position_id" property="positionId"/>
<result column="dept_id" property="deptId"/>
<result column="post_id" property="postId"/>
<result column="is_primary" property="isPrimary"/>
<result column="start_date" property="startDate"/>
<result column="end_date" property="endDate"/>
@@ -16,4 +16,34 @@
<result column="update_time" property="updateTime"/>
<result column="del_flag" property="delFlag"/>
</resultMap>
<resultMap id="VoResultMap" type="com.klp.hrm.domain.vo.HrmEmpOrgPositionVo">
<id column="rel_id" property="relId"/>
<result column="emp_id" property="empId"/>
<result column="dept_id" property="deptId"/>
<result column="dept_name" property="deptName"/>
<result column="post_id" property="postId"/>
<result column="post_name" property="postName"/>
<result column="is_primary" property="isPrimary"/>
<result column="start_date" property="startDate"/>
<result column="end_date" property="endDate"/>
<result column="remark" property="remark"/>
<result column="create_by" property="createBy"/>
<result column="create_time" property="createTime"/>
<result column="update_by" property="updateBy"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<sql id="selectVo">
SELECT
r.rel_id, r.emp_id, r.dept_id, r.post_id, r.is_primary,
r.start_date, r.end_date, r.remark,
r.create_by, r.create_time, r.update_by, r.update_time,
d.dept_name,
p.post_name
FROM hrm_emp_org_position r
LEFT JOIN sys_dept d ON r.dept_id = d.dept_id AND d.del_flag = '0'
LEFT JOIN sys_post p ON r.post_id = p.post_id
WHERE r.del_flag = 0
</sql>
</mapper>

View File

@@ -13,9 +13,8 @@
<result column="hire_date" property="hireDate"/>
<result column="employment_type" property="employmentType"/>
<result column="status" property="status"/>
<result column="grade_id" property="gradeId"/>
<result column="main_org_id" property="mainOrgId"/>
<result column="main_position_id" property="mainPositionId"/>
<result column="dept_id" property="deptId"/>
<result column="post_id" property="postId"/>
<result column="seniority_years" property="seniorityYears"/>
<result column="contract_end_date" property="contractEndDate"/>
<result column="remark" property="remark"/>
@@ -25,4 +24,54 @@
<result column="update_time" property="updateTime"/>
<result column="del_flag" property="delFlag"/>
</resultMap>
<resultMap id="VoResultMap" type="com.klp.hrm.domain.vo.HrmEmployeeVo">
<id column="emp_id" property="empId"/>
<result column="user_id" property="userId"/>
<result column="emp_no" property="empNo"/>
<result column="emp_name" property="empName"/>
<result column="gender" property="gender"/>
<result column="mobile" property="mobile"/>
<result column="email" property="email"/>
<result column="id_no" property="idNo"/>
<result column="hire_date" property="hireDate"/>
<result column="employment_type" property="employmentType"/>
<result column="status" property="status"/>
<result column="dept_id" property="deptId"/>
<result column="dept_name" property="deptName"/>
<result column="post_id" property="postId"/>
<result column="post_name" property="postName"/>
<result column="remark" property="remark"/>
<result column="create_by" property="createBy"/>
<result column="create_time" property="createTime"/>
<result column="update_by" property="updateBy"/>
<result column="update_time" property="updateTime"/>
</resultMap>
<sql id="selectVo">
SELECT
e.emp_id, e.user_id, e.emp_no, e.emp_name, e.gender, e.mobile, e.email, e.id_no,
e.hire_date, e.employment_type, e.status, e.dept_id, e.post_id, e.remark,
e.create_by, e.create_time, e.update_by, e.update_time,
d.dept_name,
p.post_name
FROM hrm_employee e
LEFT JOIN sys_dept d ON e.dept_id = d.dept_id AND d.del_flag = '0'
LEFT JOIN sys_post p ON e.post_id = p.post_id
WHERE e.del_flag = 0
</sql>
<!-- 使用 JOIN 查询的 select 语句,确保使用 VoResultMap -->
<select id="selectVoPage" resultMap="VoResultMap">
<include refid="selectVo"/>
</select>
<select id="selectVoList" resultMap="VoResultMap">
<include refid="selectVo"/>
</select>
<select id="selectVoById" resultMap="VoResultMap">
<include refid="selectVo"/>
AND e.emp_id = #{empId}
</select>
</mapper>

View File

@@ -1,16 +0,0 @@
<?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.klp.hrm.mapper.HrmGradeMapper">
<resultMap id="BaseResultMap" type="com.klp.hrm.domain.HrmGrade">
<id column="grade_id" property="gradeId"/>
<result column="grade_code" property="gradeCode"/>
<result column="grade_name" property="gradeName"/>
<result column="level_no" property="levelNo"/>
<result column="remark" property="remark"/>
<result column="create_by" property="createBy"/>
<result column="create_time" property="createTime"/>
<result column="update_by" property="updateBy"/>
<result column="update_time" property="updateTime"/>
<result column="del_flag" property="delFlag"/>
</resultMap>
</mapper>

View File

@@ -3,8 +3,8 @@
<mapper namespace="com.klp.hrm.mapper.HrmHeadcountPlanMapper">
<resultMap id="BaseResultMap" type="com.klp.hrm.domain.HrmHeadcountPlan">
<id column="plan_id" property="planId"/>
<result column="org_id" property="orgId"/>
<result column="position_id" property="positionId"/>
<result column="dept_id" property="deptId"/>
<result column="post_id" property="postId"/>
<result column="year" property="year"/>
<result column="month" property="month"/>
<result column="budget_count" property="budgetCount"/>

View File

@@ -1,20 +0,0 @@
<?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.klp.hrm.mapper.HrmOrgMapper">
<resultMap id="BaseResultMap" type="com.klp.hrm.domain.HrmOrg">
<id column="org_id" property="orgId"/>
<result column="parent_id" property="parentId"/>
<result column="org_code" property="orgCode"/>
<result column="org_name" property="orgName"/>
<result column="org_type" property="orgType"/>
<result column="leader_user_id" property="leaderUserId"/>
<result column="order_num" property="orderNum"/>
<result column="status" property="status"/>
<result column="remark" property="remark"/>
<result column="create_by" property="createBy"/>
<result column="create_time" property="createTime"/>
<result column="update_by" property="updateBy"/>
<result column="update_time" property="updateTime"/>
<result column="del_flag" property="delFlag"/>
</resultMap>
</mapper>

View File

@@ -1,22 +0,0 @@
<?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.klp.hrm.mapper.HrmOvertimeReqMapper">
<resultMap id="BaseResultMap" type="com.klp.hrm.domain.HrmOvertimeReq">
<id column="biz_id" property="bizId"/>
<result column="emp_id" property="empId"/>
<result column="ot_type" property="otType"/>
<result column="start_time" property="startTime"/>
<result column="end_time" property="endTime"/>
<result column="hours" property="hours"/>
<result column="reason" property="reason"/>
<result column="status" property="status"/>
<result column="accessory_apply_ids" property="accessoryApplyIds"/>
<result column="accessory_receipt_ids" property="accessoryReceiptIds"/>
<result column="remark" property="remark"/>
<result column="create_by" property="createBy"/>
<result column="create_time" property="createTime"/>
<result column="update_by" property="updateBy"/>
<result column="update_time" property="updateTime"/>
<result column="del_flag" property="delFlag"/>
</resultMap>
</mapper>

View File

@@ -1,18 +0,0 @@
<?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.klp.hrm.mapper.HrmPositionMapper">
<resultMap id="BaseResultMap" type="com.klp.hrm.domain.HrmPosition">
<id column="position_id" property="positionId"/>
<result column="position_code" property="positionCode"/>
<result column="position_name" property="positionName"/>
<result column="grade_id" property="gradeId"/>
<result column="order_num" property="orderNum"/>
<result column="status" property="status"/>
<result column="remark" property="remark"/>
<result column="create_by" property="createBy"/>
<result column="create_time" property="createTime"/>
<result column="update_by" property="updateBy"/>
<result column="update_time" property="updateTime"/>
<result column="del_flag" property="delFlag"/>
</resultMap>
</mapper>

View File

@@ -6,11 +6,16 @@
<result column="emp_id" property="empId"/>
<result column="start_time" property="startTime"/>
<result column="end_time" property="endTime"/>
<result column="travel_type" property="travelType"/>
<result column="destination" property="destination"/>
<result column="reason" property="reason"/>
<result column="status" property="status"/>
<result column="accessory_apply_ids" property="accessoryApplyIds"/>
<result column="accessory_receipt_ids" property="accessoryReceiptIds"/>
<result column="payee_name" property="payeeName"/>
<result column="estimated_cost" property="estimatedCost"/>
<result column="bank_name" property="bankName"/>
<result column="bank_account" property="bankAccount"/>
<result column="remark" property="remark"/>
<result column="create_by" property="createBy"/>
<result column="create_time" property="createTime"/>