diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhEmployee.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhEmployee.java
index ee2d224..916105d 100644
--- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhEmployee.java
+++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhEmployee.java
@@ -7,246 +7,288 @@ import com.ruoyi.common.core.domain.BaseEntity;
/**
* 职工信息对象 kh_employee
- *
+ *
* @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 = "性别(男/女/未知)",readConverterExp = "0=男,1=女,2=未知")
+ /**
+ * 工号
+ */
+ @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;
}
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("userId", getUserId())
- .append("deptId", getDeptId())
- .append("deptName", getDeptName())
- .append("empName", getEmpName())
- .append("sex", getSex())
- .append("age", getAge())
- .append("phone", getPhone())
- .append("idcard", getIdcard())
- .append("bankCardNumber", getBankCardNumber())
- .append("openingBank", getOpeningBank())
- .append("education", getEducation())
- .append("address", getAddress())
- .append("contact", getContact())
- .append("contactPhone", getContactPhone())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
+ return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("userId", getUserId())
+ .append("deptId", getDeptId())
+ .append("deptName", getDeptName())
+ .append("empName", getEmpName())
+ .append("wordId", getWordId())
+ .append("position", getPosition())
+ .append("sex", getSex())
+ .append("age", getAge())
+ .append("phone", getPhone())
+ .append("idcard", getIdcard())
+ .append("bankCardNumber", getBankCardNumber())
+ .append("openingBank", getOpeningBank())
+ .append("education", getEducation())
+ .append("docs", getDocs())
+ .append("address", getAddress())
+ .append("contact", getContact())
+ .append("contactPhone", getContactPhone())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("remark", getRemark())
+ .toString();
}
}
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhEmployeeMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhEmployeeMapper.xml
index 99bfd50..8a6323d 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhEmployeeMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhEmployeeMapper.xml
@@ -10,6 +10,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -17,6 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -28,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- 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