备份

ruoyi-oa/src/main/resources/mapper/oa/EmployeeFilesMapper.xml

@@ -0,0 +1,39 @@
+<?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.ruoyi.oa.mapper.EmployeeFilesMapper">
+
+    <resultMap type="com.ruoyi.oa.domain.EmployeeFiles" id="EmployeeFilesResult">
+        <result property="fileId" column="file_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="fileType" column="file_type"/>
+        <result property="fileName" column="file_name"/>
+        <result property="filePath" column="file_path"/>
+        <result property="uploadTime" column="upload_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="delFlag" column="del_flag"/>
+    </resultMap>
+
+    <delete id="deleteByUserId" parameterType="Long">
+        delete from employee_files where user_id = #{userId}
+    </delete>
+
+
+    <select id="selectFileUserVoPage" resultType="com.ruoyi.oa.domain.vo.FileUser">
+        select su.user_id,su.nick_name,joining_date,count(file_id) AS fileTotal from sys_user su
+                                                                                         left join employee_onboarding eo on su.user_id = eo.user_id
+                                                                                         left join fad_oa.employee_files ef on su.user_id = ef.user_id AND ef.del_flag = '0'
+            ${ew.getCustomSqlSegment}
+        GROUP BY
+            su.user_id,
+            su.nick_name,
+            eo.joining_date
+
+    </select>
+
+
+</mapper>

ruoyi-oa/src/main/resources/mapper/oa/EmployeeOnboardingMapper.xml

@@ -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>