hansha
/
kaohe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

职工、部门添加附件及简介

Browse Source
main 57
hshansha 2 months ago
parent 8fb5db2bbf
commit b266e01694
4 changed files with 231 additions and 143 deletions
Show Stats Download Patch File Download Diff File

23
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java
Unescape View File

@ -42,6 +42,11 @@ public class SysDept extends BaseEntity
/** 邮箱 */ /** 邮箱 */
private String email; private String email;
/** 附件 */
private String docs;
/** 附件简介 */
private String docDiscrip;
/** 部门状态:0正常,1停用 */ /** 部门状态:0正常,1停用 */
private String status; private String status;
@ -85,6 +90,22 @@ public class SysDept extends BaseEntity
this.ancestors = ancestors; 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 = "部门名称不能为空") @NotBlank(message = "部门名称不能为空")
@Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符") @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
public String getDeptName() public String getDeptName()
@ -192,6 +213,8 @@ public class SysDept extends BaseEntity
.append("leader", getLeader()) .append("leader", getLeader())
.append("phone", getPhone()) .append("phone", getPhone())
.append("email", getEmail()) .append("email", getEmail())
.append("docs", getDocs())
.append("docDiscrip", getDocDiscrip())
.append("status", getStatus()) .append("status", getStatus())
.append("delFlag", getDelFlag()) .append("delFlag", getDelFlag())
.append("createBy", getCreateBy()) .append("createBy", getCreateBy())

15
ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhEmployee.java
Unescape View File

@ -98,9 +98,13 @@ public class KhEmployee extends BaseEntity {
private String education; private String education;
/** 文档 */ /** 文档 */
@Excel(name = "文档") // @Excel(name = "文档")
private String docs; private String docs;
/** 附件简介 */
@Excel(name = "附件简介")
private String docDiscrip;
/** /**
* 家庭住址 * 家庭住址
*/ */
@ -119,6 +123,14 @@ public class KhEmployee extends BaseEntity {
@Excel(name = "紧急联系人电话") @Excel(name = "紧急联系人电话")
private String contactPhone; private String contactPhone;
public String getDocDiscrip() {
return docDiscrip;
}
public void setDocDiscrip(String docDiscrip) {
this.docDiscrip = docDiscrip;
}
public String getWordId() { public String getWordId() {
return wordId; return wordId;
} }
@ -281,6 +293,7 @@ public class KhEmployee extends BaseEntity {
.append("openingBank", getOpeningBank()) .append("openingBank", getOpeningBank())
.append("education", getEducation()) .append("education", getEducation())
.append("docs", getDocs()) .append("docs", getDocs())
.append("docDiscrip", getDocDiscrip())
.append("address", getAddress()) .append("address", getAddress())
.append("contact", getContact()) .append("contact", getContact())
.append("contactPhone", getContactPhone()) .append("contactPhone", getContactPhone())

7
ruoyi-kaohe/src/main/resources/mapper/kaohe/KhEmployeeMapper.xml
Unescape View File

@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="openingBank" column="opening_bank" /> <result property="openingBank" column="opening_bank" />
<result property="education" column="education" /> <result property="education" column="education" />
<result property="docs" column="docs" /> <result property="docs" column="docs" />
<result property="docDiscrip" column="doc_discrip" />
<result property="address" column="address" /> <result property="address" column="address" />
<result property="contact" column="contact" /> <result property="contact" column="contact" />
<result property="contactPhone" column="contact_phone" /> <result property="contactPhone" column="contact_phone" />
@ -31,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectKhEmployeeVo"> <sql id="selectKhEmployeeVo">
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
</sql> </sql>
<select id="selectKhEmployeeList" parameterType="KhEmployee" resultMap="KhEmployeeResult"> <select id="selectKhEmployeeList" parameterType="KhEmployee" resultMap="KhEmployeeResult">
@ -51,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="openingBank != null and openingBank != ''"> and opening_bank = #{openingBank}</if> <if test="openingBank != null and openingBank != ''"> and opening_bank = #{openingBank}</if>
<if test="education != null and education != ''"> and education = #{education}</if> <if test="education != null and education != ''"> and education = #{education}</if>
<if test="docs != null and docs != ''"> and docs = #{docs}</if> <if test="docs != null and docs != ''"> and docs = #{docs}</if>
<if test="docDiscrip != null and docDiscrip != ''"> and doc_discrip = #{docDiscrip}</if>
<if test="address != null and address != ''"> and address = #{address}</if> <if test="address != null and address != ''"> and address = #{address}</if>
<if test="contact != null and contact != ''"> and contact = #{contact}</if> <if test="contact != null and contact != ''"> and contact = #{contact}</if>
<if test="contactPhone != null and contactPhone != ''"> and contact_phone = #{contactPhone}</if> <if test="contactPhone != null and contactPhone != ''"> and contact_phone = #{contactPhone}</if>
@ -79,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="openingBank != null">opening_bank,</if> <if test="openingBank != null">opening_bank,</if>
<if test="education != null">education,</if> <if test="education != null">education,</if>
<if test="docs != null">docs,</if> <if test="docs != null">docs,</if>
<if test="docDiscrip != null">doc_discrip,</if>
<if test="address != null">address,</if> <if test="address != null">address,</if>
<if test="contact != null">contact,</if> <if test="contact != null">contact,</if>
<if test="contactPhone != null">contact_phone,</if> <if test="contactPhone != null">contact_phone,</if>
@ -103,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="openingBank != null">#{openingBank},</if> <if test="openingBank != null">#{openingBank},</if>
<if test="education != null">#{education},</if> <if test="education != null">#{education},</if>
<if test="docs != null">#{docs},</if> <if test="docs != null">#{docs},</if>
<if test="docDiscrip != null">#{docDiscrip},</if>
<if test="address != null">#{address},</if> <if test="address != null">#{address},</if>
<if test="contact != null">#{contact},</if> <if test="contact != null">#{contact},</if>
<if test="contactPhone != null">#{contactPhone},</if> <if test="contactPhone != null">#{contactPhone},</if>
@ -131,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="openingBank != null">opening_bank = #{openingBank},</if> <if test="openingBank != null">opening_bank = #{openingBank},</if>
<if test="education != null">education = #{education},</if> <if test="education != null">education = #{education},</if>
<if test="docs != null">docs = #{docs},</if> <if test="docs != null">docs = #{docs},</if>
<if test="docDiscrip != null">doc_discrip = #{docDiscrip},</if>
<if test="address != null">address = #{address},</if> <if test="address != null">address = #{address},</if>
<if test="contact != null">contact = #{contact},</if> <if test="contact != null">contact = #{contact},</if>
<if test="contactPhone != null">contact_phone = #{contactPhone},</if> <if test="contactPhone != null">contact_phone = #{contactPhone},</if>

329
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
Unescape View File

@ -1,159 +1,206 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.SysDeptMapper"> <mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
<resultMap type="SysDept" id="SysDeptResult"> <resultMap type="SysDept" id="SysDeptResult">
<id property="deptId" column="dept_id" /> <id property="deptId" column="dept_id"/>
<result property="parentId" column="parent_id" /> <result property="parentId" column="parent_id"/>
<result property="ancestors" column="ancestors" /> <result property="ancestors" column="ancestors"/>
<result property="deptName" column="dept_name" /> <result property="deptName" column="dept_name"/>
<result property="orderNum" column="order_num" /> <result property="orderNum" column="order_num"/>
<result property="leader" column="leader" /> <result property="leader" column="leader"/>
<result property="phone" column="phone" /> <result property="phone" column="phone"/>
<result property="email" column="email" /> <result property="email" column="email"/>
<result property="status" column="status" /> <result property="docs" column="docs"/>
<result property="delFlag" column="del_flag" /> <result property="docDiscrip" column="doc_discrip"/>
<result property="parentName" column="parent_name" /> <result property="status" column="status"/>
<result property="createBy" column="create_by" /> <result property="delFlag" column="del_flag"/>
<result property="createTime" column="create_time" /> <result property="parentName" column="parent_name"/>
<result property="updateBy" column="update_by" /> <result property="createBy" column="create_by"/>
<result property="updateTime" column="update_time" /> <result property="createTime" column="create_time"/>
</resultMap> <result property="updateBy" column="update_by"/>
<result property="updateTime" column="update_time"/>
<sql id="selectDeptVo"> </resultMap>
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time
<sql id="selectDeptVo">
select d.dept_id,
d.parent_id,
d.ancestors,
d.dept_name,
d.order_num,
d.leader,
d.phone,
d.email,
d.docs,
d.doc_discrip,
d.status,
d.del_flag,
d.create_by,
d.create_time
from sys_dept d from sys_dept d
</sql> </sql>
<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult"> <select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
<include refid="selectDeptVo"/> <include refid="selectDeptVo"/>
where d.del_flag = '0' where d.del_flag = '0'
<if test="deptId != null and deptId != 0"> <if test="deptId != null and deptId != 0">
AND dept_id = #{deptId} AND dept_id = #{deptId}
</if> </if>
<if test="parentId != null and parentId != 0"> <if test="parentId != null and parentId != 0">
AND parent_id = #{parentId} AND parent_id = #{parentId}
</if> </if>
<if test="deptName != null and deptName != ''"> <if test="deptName != null and deptName != ''">
AND dept_name like concat('%', #{deptName}, '%') AND dept_name like concat('%', #{deptName}, '%')
</if> </if>
<if test="status != null and status != ''"> <!--<if test="docs != null and docs != ''"> and docs = #{docs}</if>
AND status = #{status} <if test="docDiscrip != null and docDiscrip != ''"> and doc_discrip = #{docDiscrip}</if>-->
</if> <if test="status != null and status != ''">
<!-- 数据范围过滤 --> AND status = #{status}
${params.dataScope} </if>
order by d.parent_id, d.order_num <!-- 数据范围过滤 -->
${params.dataScope}
order by d.parent_id, d.order_num
</select> </select>
<select id="selectDeptListByRoleId" resultType="Long"> <select id="selectDeptListByRoleId" resultType="Long">
select d.dept_id select d.dept_id
from sys_dept d from sys_dept d
left join sys_role_dept rd on d.dept_id = rd.dept_id left join sys_role_dept rd on d.dept_id = rd.dept_id
where rd.role_id = #{roleId} where rd.role_id = #{roleId}
<if test="deptCheckStrictly"> <if test="deptCheckStrictly">
and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId}) and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id =
</if> rd.dept_id and rd.role_id = #{roleId})
order by d.parent_id, d.order_num </if>
</select> order by d.parent_id, d.order_num
</select>
<select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult"> <select id="selectDeptById" parameterType="Long" resultMap="SysDeptResult">
select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, select d.dept_id,
(select dept_name from sys_dept where dept_id = d.parent_id) parent_name d.parent_id,
from sys_dept d d.ancestors,
where d.dept_id = #{deptId} d.dept_name,
</select> d.order_num,
d.leader,
d.phone,
d.email,
d.docs,
d.doc_discrip,
d.status,
(select dept_name from sys_dept where dept_id = d.parent_id) parent_name
from sys_dept d
where d.dept_id = #{deptId}
</select>
<select id="checkDeptExistUser" parameterType="Long" resultType="int"> <select id="checkDeptExistUser" parameterType="Long" resultType="int">
select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0' select count(1)
</select> from sys_user
where dept_id = #{deptId}
<select id="hasChildByDeptId" parameterType="Long" resultType="int"> and del_flag = '0'
select count(1) from sys_dept </select>
where del_flag = '0' and parent_id = #{deptId} limit 1
</select> <select id="hasChildByDeptId" parameterType="Long" resultType="int">
select count(1)
<select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult"> from sys_dept
select * from sys_dept where find_in_set(#{deptId}, ancestors) where del_flag = '0'
</select> and parent_id = #{deptId} limit 1
</select>
<select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
select count(*) from sys_dept where status = 0 and del_flag = '0' and find_in_set(#{deptId}, ancestors) <select id="selectChildrenDeptById" parameterType="Long" resultMap="SysDeptResult">
</select> select *
from sys_dept
<select id="checkDeptNameUnique" resultMap="SysDeptResult"> where find_in_set(#{deptId}, ancestors)
<include refid="selectDeptVo"/> </select>
where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
</select> <select id="selectNormalChildrenDeptById" parameterType="Long" resultType="int">
select count(*)
from sys_dept
where status = 0
and del_flag = '0'
and find_in_set(#{deptId}, ancestors)
</select>
<select id="checkDeptNameUnique" resultMap="SysDeptResult">
<include refid="selectDeptVo"/>
where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1
</select>
<insert id="insertDept" parameterType="SysDept"> <insert id="insertDept" parameterType="SysDept">
insert into sys_dept( insert into sys_dept(
<if test="deptId != null and deptId != 0">dept_id,</if> <if test="deptId != null and deptId != 0">dept_id,</if>
<if test="parentId != null and parentId != 0">parent_id,</if> <if test="parentId != null and parentId != 0">parent_id,</if>
<if test="deptName != null and deptName != ''">dept_name,</if> <if test="deptName != null and deptName != ''">dept_name,</if>
<if test="ancestors != null and ancestors != ''">ancestors,</if> <if test="ancestors != null and ancestors != ''">ancestors,</if>
<if test="orderNum != null">order_num,</if> <if test="orderNum != null">order_num,</if>
<if test="leader != null and leader != ''">leader,</if> <if test="leader != null and leader != ''">leader,</if>
<if test="phone != null and phone != ''">phone,</if> <if test="phone != null and phone != ''">phone,</if>
<if test="email != null and email != ''">email,</if> <if test="email != null and email != ''">email,</if>
<if test="status != null">status,</if> <if test="docs != null">docs,</if>
<if test="createBy != null and createBy != ''">create_by,</if> <if test="docDiscrip != null">doc_discrip,</if>
create_time <if test="status != null">status,</if>
)values( <if test="createBy != null and createBy != ''">create_by,</if>
<if test="deptId != null and deptId != 0">#{deptId},</if> create_time
<if test="parentId != null and parentId != 0">#{parentId},</if> )values(
<if test="deptName != null and deptName != ''">#{deptName},</if> <if test="deptId != null and deptId != 0">#{deptId},</if>
<if test="ancestors != null and ancestors != ''">#{ancestors},</if> <if test="parentId != null and parentId != 0">#{parentId},</if>
<if test="orderNum != null">#{orderNum},</if> <if test="deptName != null and deptName != ''">#{deptName},</if>
<if test="leader != null and leader != ''">#{leader},</if> <if test="ancestors != null and ancestors != ''">#{ancestors},</if>
<if test="phone != null and phone != ''">#{phone},</if> <if test="orderNum != null">#{orderNum},</if>
<if test="email != null and email != ''">#{email},</if> <if test="leader != null and leader != ''">#{leader},</if>
<if test="status != null">#{status},</if> <if test="phone != null and phone != ''">#{phone},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if> <if test="email != null and email != ''">#{email},</if>
sysdate() <if test="docs != null">#{docs},</if>
) <if test="docDiscrip != null">#{docDiscrip},</if>
</insert> <if test="status != null">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
<update id="updateDept" parameterType="SysDept"> sysdate()
update sys_dept )
<set> </insert>
<if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
<if test="deptName != null and deptName != ''">dept_name = #{deptName},</if> <update id="updateDept" parameterType="SysDept">
<if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if> update sys_dept
<if test="orderNum != null">order_num = #{orderNum},</if> <set>
<if test="leader != null">leader = #{leader},</if> <if test="parentId != null and parentId != 0">parent_id = #{parentId},</if>
<if test="phone != null">phone = #{phone},</if> <if test="deptName != null and deptName != ''">dept_name = #{deptName},</if>
<if test="email != null">email = #{email},</if> <if test="ancestors != null and ancestors != ''">ancestors = #{ancestors},</if>
<if test="status != null and status != ''">status = #{status},</if> <if test="orderNum != null">order_num = #{orderNum},</if>
<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if> <if test="leader != null">leader = #{leader},</if>
update_time = sysdate() <if test="phone != null">phone = #{phone},</if>
</set> <if test="email != null">email = #{email},</if>
where dept_id = #{deptId} <if test="docs != null">docs = #{docs},</if>
</update> <if test="docDiscrip != null">doc_discrip = #{docDiscrip},</if>
<if test="status != null and status != ''">status = #{status},</if>
<update id="updateDeptChildren" parameterType="java.util.List"> <if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
update sys_dept set ancestors = update_time = sysdate()
<foreach collection="depts" item="item" index="index" </set>
separator=" " open="case dept_id" close="end"> where dept_id = #{deptId}
when #{item.deptId} then #{item.ancestors} </update>
</foreach>
where dept_id in <update id="updateDeptChildren" parameterType="java.util.List">
<foreach collection="depts" item="item" index="index" update sys_dept set ancestors =
separator="," open="(" close=")"> <foreach collection="depts" item="item" index="index"
#{item.deptId} separator=" " open="case dept_id" close="end">
</foreach> when #{item.deptId} then #{item.ancestors}
</update> </foreach>
where dept_id in
<update id="updateDeptStatusNormal" parameterType="Long"> <foreach collection="depts" item="item" index="index"
update sys_dept set status = '0' where dept_id in separator="," open="(" close=")">
<foreach collection="array" item="deptId" open="(" separator="," close=")"> #{item.deptId}
#{deptId}
</foreach> </foreach>
</update> </update>
<delete id="deleteDeptById" parameterType="Long"> <update id="updateDeptStatusNormal" parameterType="Long">
update sys_dept set del_flag = '2' where dept_id = #{deptId} update sys_dept set status = '0' where dept_id in
</delete> <foreach collection="array" item="deptId" open="(" separator="," close=")">
#{deptId}
</foreach>
</update>
<delete id="deleteDeptById" parameterType="Long">
update sys_dept
set del_flag = '2'
where dept_id = #{deptId}
</delete>
</mapper> </mapper>
Write Preview
Loading…
Cancel
Save