职员添加字段

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhEmployee.java

@@ -11,216 +11,255 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author hs
  * @date 2025-06-17
  */
-public class KhEmployee extends BaseEntity
-{
+public class KhEmployee extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 主键 */
+    /**
+     * 主键
+     */
     private Long id;
 
-    /** 登录用户id */
+    /**
+     * 登录用户id
+     */
     //@Excel(name = "登录用户id")
     private Long userId;
 
-    /** 职工所属部门 */
+    /**
+     * 职工所属部门
+     */
     @Excel(name = "职工所属部门")
     private Long deptId;
 
-    /** 部门名称 */
+    /**
+     * 部门名称
+     */
     @Excel(name = "部门名称")
     private String deptName;
 
-    /** 职工姓名 */
+    /**
+     * 职工姓名
+     */
     @Excel(name = "职工姓名")
     private String empName;
 
-    /** 性别（0：男 1：女) */
+    /**
+     * 工号
+     */
+    @Excel(name = "工号")
+    private String wordId;
+
+    /**
+     * 职位
+     */
+    @Excel(name = "职位")
+    private String position;
+
+    /**
+     * 性别（0：男 1：女)
+     */
     @Excel(name = "性别(男/女/未知)", readConverterExp = "0=男,1=女,2=未知")
     private String sex;
 
-    /** 年龄 */
+    /**
+     * 年龄
+     */
     @Excel(name = "年龄")
     private Long age;
 
-    /** 手机号 */
+    /**
+     * 手机号
+     */
     @Excel(name = "手机号")
     private String phone;
 
-    /** 身份证号 */
+    /**
+     * 身份证号
+     */
     @Excel(name = "身份证号")
     private String idcard;
 
-    /** 银行卡号 */
+    /**
+     * 银行卡号
+     */
     @Excel(name = "银行卡号")
     private String bankCardNumber;
 
-    /** 开户行 */
+    /**
+     * 开户行
+     */
     @Excel(name = "开户行")
     private String openingBank;
 
-    /** 学历 */
+    /**
+     * 学历
+     */
     @Excel(name = "学历")
     private String education;
 
-    /** 家庭住址 */
+    /** 文档 */
+    @Excel(name = "文档")
+    private String docs;
+
+    /**
+     * 家庭住址
+     */
     @Excel(name = "家庭住址")
     private String address;
 
-    /** 紧急联系人 */
+    /**
+     * 紧急联系人
+     */
     @Excel(name = "紧急联系人")
     private String contact;
 
-    /** 紧急联系人电话 */
+    /**
+     * 紧急联系人电话
+     */
     @Excel(name = "紧急联系人电话")
     private String contactPhone;
 
-    public void setId(Long id) 
-    {
+    public String getWordId() {
+        return wordId;
+    }
+
+    public void setWordId(String wordId) {
+        this.wordId = wordId;
+    }
+
+    public String getDocs() {
+        return docs;
+    }
+
+    public void setDocs(String docs) {
+        this.docs = docs;
+    }
+
+    public String getPosition() {
+        return position;
+    }
+
+    public void setPosition(String position) {
+        this.position = position;
+    }
+
+    public void setId(Long id) {
         this.id = id;
     }
 
-    public Long getId() 
-    {
+    public Long getId() {
         return id;
     }
 
-    public void setUserId(Long userId) 
-    {
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
-    public Long getUserId() 
-    {
+    public Long getUserId() {
         return userId;
     }
 
-    public void setDeptId(Long deptId) 
-    {
+    public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
 
-    public Long getDeptId() 
-    {
+    public Long getDeptId() {
         return deptId;
     }
 
-    public void setDeptName(String deptName) 
-    {
+    public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
 
-    public String getDeptName() 
-    {
+    public String getDeptName() {
         return deptName;
     }
 
-    public void setEmpName(String empName) 
-    {
+    public void setEmpName(String empName) {
         this.empName = empName;
     }
 
-    public String getEmpName() 
-    {
+    public String getEmpName() {
         return empName;
     }
 
-    public void setSex(String sex) 
-    {
+    public void setSex(String sex) {
         this.sex = sex;
     }
 
-    public String getSex() 
-    {
+    public String getSex() {
         return sex;
     }
 
-    public void setAge(Long age) 
-    {
+    public void setAge(Long age) {
         this.age = age;
     }
 
-    public Long getAge() 
-    {
+    public Long getAge() {
         return age;
     }
 
-    public void setPhone(String phone) 
-    {
+    public void setPhone(String phone) {
         this.phone = phone;
     }
 
-    public String getPhone() 
-    {
+    public String getPhone() {
         return phone;
     }
 
-    public void setIdcard(String idcard) 
-    {
+    public void setIdcard(String idcard) {
         this.idcard = idcard;
     }
 
-    public String getIdcard() 
-    {
+    public String getIdcard() {
         return idcard;
     }
 
-    public void setBankCardNumber(String bankCardNumber) 
-    {
+    public void setBankCardNumber(String bankCardNumber) {
         this.bankCardNumber = bankCardNumber;
     }
 
-    public String getBankCardNumber() 
-    {
+    public String getBankCardNumber() {
         return bankCardNumber;
     }
 
-    public void setOpeningBank(String openingBank) 
-    {
+    public void setOpeningBank(String openingBank) {
         this.openingBank = openingBank;
     }
 
-    public String getOpeningBank() 
-    {
+    public String getOpeningBank() {
         return openingBank;
     }
 
-    public void setEducation(String education) 
-    {
+    public void setEducation(String education) {
         this.education = education;
     }
 
-    public String getEducation() 
-    {
+    public String getEducation() {
         return education;
     }
 
-    public void setAddress(String address) 
-    {
+    public void setAddress(String address) {
         this.address = address;
     }
 
-    public String getAddress() 
-    {
+    public String getAddress() {
         return address;
     }
 
-    public void setContact(String contact) 
-    {
+    public void setContact(String contact) {
         this.contact = contact;
     }
 
-    public String getContact() 
-    {
+    public String getContact() {
         return contact;
     }
 
-    public void setContactPhone(String contactPhone) 
-    {
+    public void setContactPhone(String contactPhone) {
         this.contactPhone = contactPhone;
     }
 
-    public String getContactPhone() 
-    {
+    public String getContactPhone() {
         return contactPhone;
     }
 
@@ -232,6 +271,8 @@ public class KhEmployee extends BaseEntity
                 .append("deptId", getDeptId())
                 .append("deptName", getDeptName())
                 .append("empName", getEmpName())
+                .append("wordId", getWordId())
+                .append("position", getPosition())
                 .append("sex", getSex())
                 .append("age", getAge())
                 .append("phone", getPhone())
@@ -239,6 +280,7 @@ public class KhEmployee extends BaseEntity
                 .append("bankCardNumber", getBankCardNumber())
                 .append("openingBank", getOpeningBank())
                 .append("education", getEducation())
+                .append("docs", getDocs())
                 .append("address", getAddress())
                 .append("contact", getContact())
                 .append("contactPhone", getContactPhone())

ruoyi-kaohe/src/main/resources/mapper/kaohe/KhEmployeeMapper.xml

@@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptId"    column="dept_id"    />
         <result property="deptName"    column="dept_name"    />
         <result property="empName"    column="emp_name"    />
+        <result property="wordId"    column="word_id"    />
+        <result property="position"    column="position"    />
         <result property="sex"    column="sex"    />
         <result property="age"    column="age"    />
         <result property="phone"    column="phone"    />
@@ -17,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bankCardNumber"    column="bank_card_number"    />
         <result property="openingBank"    column="opening_bank"    />
         <result property="education"    column="education"    />
+        <result property="docs"    column="docs"    />
         <result property="address"    column="address"    />
         <result property="contact"    column="contact"    />
         <result property="contactPhone"    column="contact_phone"    />
@@ -28,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectKhEmployeeVo">
-        select id, user_id, dept_id, dept_name, emp_name, sex, age, phone, idcard, bank_card_number, opening_bank, education, address, contact, contact_phone, create_by, create_time, update_by, update_time, remark from kh_employee
+        select id, user_id, dept_id, dept_name, emp_name,word_id, `position`, sex, age, phone, idcard, bank_card_number, opening_bank, education,docs, address, contact, contact_phone, create_by, create_time, update_by, update_time, remark from kh_employee
     </sql>
 
     <select id="selectKhEmployeeList" parameterType="KhEmployee" resultMap="KhEmployeeResult">
@@ -38,6 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="deptName != null  and deptName != ''"> and dept_name like concat('%', #{deptName}, '%')</if>
             <if test="empName != null  and empName != ''"> and emp_name like concat('%', #{empName}, '%')</if>
+            <if test="wordId != null  and wordId != ''"> and word_id = #{wordId}</if>
+            <if test="position != null  and position != ''"> and `position` = #{position}</if>
             <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
             <if test="age != null "> and age = #{age}</if>
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
@@ -45,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bankCardNumber != null  and bankCardNumber != ''"> and bank_card_number = #{bankCardNumber}</if>
             <if test="openingBank != null  and openingBank != ''"> and opening_bank = #{openingBank}</if>
             <if test="education != null  and education != ''"> and education = #{education}</if>
+            <if test="docs != null  and docs != ''"> and docs = #{docs}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="contact != null  and contact != ''"> and contact = #{contact}</if>
             <if test="contactPhone != null  and contactPhone != ''"> and contact_phone = #{contactPhone}</if>
@@ -63,6 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id,</if>
             <if test="deptName != null">dept_name,</if>
             <if test="empName != null and empName != ''">emp_name,</if>
+            <if test="wordId != null">word_id,</if>
+            <if test="position != null">`position`,</if>
             <if test="sex != null">sex,</if>
             <if test="age != null">age,</if>
             <if test="phone != null">phone,</if>
@@ -70,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bankCardNumber != null">bank_card_number,</if>
             <if test="openingBank != null">opening_bank,</if>
             <if test="education != null">education,</if>
+            <if test="docs != null">docs,</if>
             <if test="address != null">address,</if>
             <if test="contact != null">contact,</if>
             <if test="contactPhone != null">contact_phone,</if>
@@ -84,6 +93,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">#{deptId},</if>
             <if test="deptName != null">#{deptName},</if>
             <if test="empName != null and empName != ''">#{empName},</if>
+            <if test="wordId != null">#{wordId},</if>
+            <if test="position != null">#{position},</if>
             <if test="sex != null">#{sex},</if>
             <if test="age != null">#{age},</if>
             <if test="phone != null">#{phone},</if>
@@ -91,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bankCardNumber != null">#{bankCardNumber},</if>
             <if test="openingBank != null">#{openingBank},</if>
             <if test="education != null">#{education},</if>
+            <if test="docs != null">#{docs},</if>
             <if test="address != null">#{address},</if>
             <if test="contact != null">#{contact},</if>
             <if test="contactPhone != null">#{contactPhone},</if>
@@ -109,6 +121,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deptId != null">dept_id = #{deptId},</if>
             <if test="deptName != null">dept_name = #{deptName},</if>
             <if test="empName != null and empName != ''">emp_name = #{empName},</if>
+            <if test="wordId != null">word_id = #{wordId},</if>
+            <if test="position != null">`position` = #{position},</if>
             <if test="sex != null">sex = #{sex},</if>
             <if test="age != null">age = #{age},</if>
             <if test="phone != null">phone = #{phone},</if>
@@ -116,6 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bankCardNumber != null">bank_card_number = #{bankCardNumber},</if>
             <if test="openingBank != null">opening_bank = #{openingBank},</if>
             <if test="education != null">education = #{education},</if>
+            <if test="docs != null">docs = #{docs},</if>
             <if test="address != null">address = #{address},</if>
             <if test="contact != null">contact = #{contact},</if>
             <if test="contactPhone != null">contact_phone = #{contactPhone},</if>