diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
index fb18c5c..9fa9248 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
@@ -42,6 +42,11 @@ public class SysDept extends BaseEntity
/** 邮箱 */
private String email;
+ /** 附件 */
+ private String docs;
+
+ /** 附件简介 */
+ private String docDiscrip;
/** 部门状态:0正常,1停用 */
private String status;
@@ -85,6 +90,22 @@ public class SysDept extends BaseEntity
this.ancestors = ancestors;
}
+ public String getDocs() {
+ return docs;
+ }
+
+ public void setDocs(String docs) {
+ this.docs = docs;
+ }
+
+ public String getDocDiscrip() {
+ return docDiscrip;
+ }
+
+ public void setDocDiscrip(String docDiscrip) {
+ this.docDiscrip = docDiscrip;
+ }
+
@NotBlank(message = "部门名称不能为空")
@Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
public String getDeptName()
@@ -192,6 +213,8 @@ public class SysDept extends BaseEntity
.append("leader", getLeader())
.append("phone", getPhone())
.append("email", getEmail())
+ .append("docs", getDocs())
+ .append("docDiscrip", getDocDiscrip())
.append("status", getStatus())
.append("delFlag", getDelFlag())
.append("createBy", getCreateBy())
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 9ec16d3..e359311 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
@@ -98,9 +98,13 @@ public class KhEmployee extends BaseEntity {
private String education;
/** 文档 */
- @Excel(name = "文档")
+ // @Excel(name = "文档")
private String docs;
+ /** 附件简介 */
+ @Excel(name = "附件简介")
+ private String docDiscrip;
+
/**
* 家庭住址
*/
@@ -119,6 +123,14 @@ public class KhEmployee extends BaseEntity {
@Excel(name = "紧急联系人电话")
private String contactPhone;
+ public String getDocDiscrip() {
+ return docDiscrip;
+ }
+
+ public void setDocDiscrip(String docDiscrip) {
+ this.docDiscrip = docDiscrip;
+ }
+
public String getWordId() {
return wordId;
}
@@ -281,6 +293,7 @@ public class KhEmployee extends BaseEntity {
.append("openingBank", getOpeningBank())
.append("education", getEducation())
.append("docs", getDocs())
+ .append("docDiscrip", getDocDiscrip())
.append("address", getAddress())
.append("contact", getContact())
.append("contactPhone", getContactPhone())
diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhEmployeeMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhEmployeeMapper.xml
index 8a6323d..274911c 100644
--- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhEmployeeMapper.xml
+++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhEmployeeMapper.xml
@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- 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
+ select id, user_id, dept_id, dept_name, emp_name,word_id, `position`, sex, age, phone, idcard, bank_card_number, opening_bank, education,docs,doc_discrip, address, contact, contact_phone, create_by, create_time, update_by, update_time, remark from kh_employee
+
-
-
-
-
-
-
-
-
-
+ select count(1)
+ from sys_user
+ where dept_id = #{deptId}
+ and del_flag = '0'
+
+
+
+
+
+
+
+
+
+
- insert into sys_dept(
- dept_id,
- parent_id,
- dept_name,
- ancestors,
- order_num,
- leader,
- phone,
- email,
- status,
- create_by,
- create_time
- )values(
- #{deptId},
- #{parentId},
- #{deptName},
- #{ancestors},
- #{orderNum},
- #{leader},
- #{phone},
- #{email},
- #{status},
- #{createBy},
- sysdate()
- )
-
-
-
- update sys_dept
-
- parent_id = #{parentId},
- dept_name = #{deptName},
- ancestors = #{ancestors},
- order_num = #{orderNum},
- leader = #{leader},
- phone = #{phone},
- email = #{email},
- status = #{status},
- update_by = #{updateBy},
- update_time = sysdate()
-
- where dept_id = #{deptId}
-
-
-
- update sys_dept set ancestors =
-
- when #{item.deptId} then #{item.ancestors}
-
- where dept_id in
-
- #{item.deptId}
-
-
-
-
- update sys_dept set status = '0' where dept_id in
-
- #{deptId}
+ insert into sys_dept(
+ dept_id,
+ parent_id,
+ dept_name,
+ ancestors,
+ order_num,
+ leader,
+ phone,
+ email,
+ docs,
+ doc_discrip,
+ status,
+ create_by,
+ create_time
+ )values(
+ #{deptId},
+ #{parentId},
+ #{deptName},
+ #{ancestors},
+ #{orderNum},
+ #{leader},
+ #{phone},
+ #{email},
+ #{docs},
+ #{docDiscrip},
+ #{status},
+ #{createBy},
+ sysdate()
+ )
+
+
+
+ update sys_dept
+
+ parent_id = #{parentId},
+ dept_name = #{deptName},
+ ancestors = #{ancestors},
+ order_num = #{orderNum},
+ leader = #{leader},
+ phone = #{phone},
+ email = #{email},
+ docs = #{docs},
+ doc_discrip = #{docDiscrip},
+ status = #{status},
+ update_by = #{updateBy},
+ update_time = sysdate()
+
+ where dept_id = #{deptId}
+
+
+
+ update sys_dept set ancestors =
+
+ when #{item.deptId} then #{item.ancestors}
+
+ where dept_id in
+
+ #{item.deptId}
-
-
-
- update sys_dept set del_flag = '2' where dept_id = #{deptId}
-
+
+
+
+ update sys_dept set status = '0' where dept_id in
+
+ #{deptId}
+
+
+
+
+ update sys_dept
+ set del_flag = '2'
+ where dept_id = #{deptId}
+
\ No newline at end of file