This commit is contained in:
2025-03-08 18:20:33 +08:00
parent a4faa6b48a
commit 3aca2f84dd
19 changed files with 656 additions and 18 deletions

View File

@@ -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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.oa.mapper.EmployeeOnboardingMapper">
<resultMap type="com.ruoyi.oa.domain.EmployeeOnboarding" id="EmployeeOnboardingResult">
@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="weight" column="weight"/>
<result property="emergencyContact1" column="emergency_contact1"/>
<result property="emergencyContact2" column="emergency_contact2"/>
<result property="status" column="status"/>
</resultMap>
@@ -42,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="birthDate != null and birthDate != ''">birth_date = #{birthDate},</if>
<if test="ethnicity != null and ethnicity != ''">ethnicity = #{ethnicity},</if>
<if test="confirmDate != null and confirmDate != ''">confirm_date = #{confirmDate},</if>
<if test="status != null and status != ''">status = #{status},</if>
<if test="maritalStatus != null and maritalStatus != ''">marital_status = #{maritalStatus},</if>
<if test="politicalStatus != null and politicalStatus != ''">political_status = #{politicalStatus},</if>
<if test="height != null and height != ''">height = #{height},</if>
@@ -52,5 +54,51 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where user_id = #{userId}
</update>
<select id="selectVoPagePlus" resultType="com.ruoyi.oa.domain.vo.EmployeeOnboardingVo">
SELECT
eo.user_id,
su.nick_name,
eo.joining_date,
DATEDIFF(CURDATE(), eo.joining_date) AS workTime,
eo.confirm_date,
highest_degree,
eo.remark,
eo.birth_date,
eo.status,
CASE
WHEN eo.confirm_date IS NULL THEN 0
ELSE 1
END AS confirmStatus
FROM employee_onboarding eo
LEFT JOIN sys_user su
ON su.user_id = eo.user_id
${ew.getCustomSqlSegment}
</select>
<select id="selectVoByUserId" resultType="com.ruoyi.oa.domain.vo.EmployeeOnboardingVo">
SELECT
eo.user_id,
su.nick_name,
eo.joining_date,
DATEDIFF(CURDATE(), eo.joining_date) AS workTime,
eo.confirm_date,
highest_degree,
eo.remark,
eo.birth_date,
eo.status,
political_status,
CASE
WHEN eo.confirm_date IS NULL THEN 0
ELSE 1
END AS confirmStatus
FROM employee_onboarding eo
LEFT JOIN sys_user su
ON su.user_id = eo.user_id
where eo.user_id = #{userId}
</select>
</mapper>