门卡办理流程页面展示数据查询调整

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/domain/EnrollmentKeyCard.java

@@ -1,5 +1,6 @@
 package com.jeeplus.human.enrollment.enrollmentRegistration.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jeeplus.core.domain.BaseEntity;
 import lombok.Data;
@@ -18,5 +19,9 @@ public class EnrollmentKeyCard extends BaseEntity {
     private String procInsId;
     private String processDefinitionId;
     private String enrollmentRegistrationId;   //员工入职表id
+    @TableField(exist = false)
+    private String departmentName;   //部门名称
+    @TableField(exist = false)
+    private String userName;   //人员名称
 
 }

jeeplus-modules/jeeplus-human/src/main/java/com/jeeplus/human/enrollment/enrollmentRegistration/mapper/xml/EnrollmentKeyCardMapper.xml

@@ -23,8 +23,12 @@
     <select id="getById"
             resultType="com.jeeplus.human.enrollment.enrollmentRegistration.domain.EnrollmentKeyCard">
         select
-        <include refid="Base_Column_List"></include>
+        <include refid="Base_Column_List"></include>,
+        re.name as userName,
+        so.name as departmentName
         from human_resources_enrollment_key_card a
+        left join human_resources_enrollment_registration re on a.enrollment_registration_id = re.id
+        left join sys_office so on re.department = so.id
         where a.id = #{id} and a.del_flag = '0'
     </select>
     <select id="getNoticeUserId" resultType="java.lang.String">