luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/new-exam' into new-exam

Browse Source
new-exam
wangxy 5 months ago
parent a1b1aeb71c b6f52f1dfd
commit 02e40de7e1
9 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File

1
ruoyi-admin/src/main/resources/templates/system/leave/add.html
Unescape View File

@ -9,6 +9,7 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content"> <div class="wrapper wrapper-content animated fadeInRight ibox-content">
<form class="form-horizontal m" id="form-leave-add" th:object="${addleave}"> <form class="form-horizontal m" id="form-leave-add" th:object="${addleave}">
<input name="userId" type="hidden" th:value="*{userId}" id="userId"/> <input name="userId" type="hidden" th:value="*{userId}" id="userId"/>
<input name="deptId" type="hidden" id="treeId"/>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">人员姓名：</label> <label class="col-sm-3 control-label is-required">人员姓名：</label>
<div class="col-sm-8"> <div class="col-sm-8">

1
ruoyi-admin/src/main/resources/templates/system/leave/edit.html
Unescape View File

@ -9,6 +9,7 @@
<form class="form-horizontal m" id="form-leave-edit" th:object="${tdLeave}"> <form class="form-horizontal m" id="form-leave-edit" th:object="${tdLeave}">
<input name="id" th:field="*{id}" type="hidden"> <input name="id" th:field="*{id}" type="hidden">
<input name="userId" type="hidden" th:value="*{userId}" id="userId"/> <input name="userId" type="hidden" th:value="*{userId}" id="userId"/>
<input name="deptId" type="hidden" th:field="*{deptId}" id="treeId"/>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">人员姓名：</label> <label class="col-sm-3 control-label is-required">人员姓名：</label>
<div class="col-sm-8"> <div class="col-sm-8">

1
ruoyi-admin/src/main/resources/templates/system/property/property/add.html
Unescape View File

@ -7,6 +7,7 @@
<body class="white-bg"> <body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app"> <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
<form class="form-horizontal m" id="form-property-add"> <form class="form-horizontal m" id="form-property-add">
<input name="deptId" type="hidden" id="treeId"/>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">所属地市：</label> <label class="col-sm-3 control-label is-required">所属地市：</label>
<div class="col-sm-8"> <div class="col-sm-8">

1
ruoyi-admin/src/main/resources/templates/system/property/property/edit.html
Unescape View File

@ -8,6 +8,7 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app"> <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
<form class="form-horizontal m" id="form-property-edit" th:object="${tdPropertyManager}"> <form class="form-horizontal m" id="form-property-edit" th:object="${tdPropertyManager}">
<input name="useId" th:field="*{useId}" type="hidden"> <input name="useId" th:field="*{useId}" type="hidden">
<input name="deptId" type="hidden" th:field="*{deptId}" id="treeId"/>
<div class="form-group"> <div class="form-group">
<label class="col-sm-3 control-label is-required">密品编号：</label> <label class="col-sm-3 control-label is-required">密品编号：</label>
<div class="col-sm-8"> <div class="col-sm-8">

2
ruoyi-admin/src/main/resources/templates/system/train/edit.html
Unescape View File

@ -9,7 +9,7 @@
<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app"> <div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
<form class="form-horizontal m" id="form-train-edit" th:object="${tdTrain}"> <form class="form-horizontal m" id="form-train-edit" th:object="${tdTrain}">
<input name="ID" th:field="*{ID}" type="hidden"> <input name="ID" th:field="*{ID}" type="hidden">
<!-- <input name="deptId" type="hidden" th:field="*{deptId}" id="treeId">--> <input name="deptId" type="hidden" th:field="*{deptId}" id="treeId">
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="form-group"> <div class="form-group">

14
ruoyi-system/src/main/java/com/ruoyi/system/domain/TdLeave.java
Unescape View File

@ -84,6 +84,19 @@ public class TdLeave extends BaseEntity
@Excel(name = "审核意见", readConverterExp = "0=通过,1不通过,2审核中") @Excel(name = "审核意见", readConverterExp = "0=通过,1不通过,2审核中")
private String examinestate; private String examinestate;
/**
* 部门
*/
private Long deptId;
public Long getDeptId() {
return deptId;
}
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
public void setId(Long id) public void setId(Long id)
{ {
this.id = id; this.id = id;
@ -209,6 +222,7 @@ public class TdLeave extends BaseEntity
.append("examinename", getExaminename()) .append("examinename", getExaminename())
.append("examinedate", getExaminedate()) .append("examinedate", getExaminedate())
.append("examinestate", getExaminestate()) .append("examinestate", getExaminestate())
.append("deptId", getDeptId())
.toString(); .toString();
} }
} }

14
ruoyi-system/src/main/java/com/ruoyi/system/domain/TdTrain.java
Unescape View File

@ -98,6 +98,19 @@ public class TdTrain extends BaseEntity
@Excel(name = "培训评价") @Excel(name = "培训评价")
private String TRAININFO; private String TRAININFO;
public Long getDeptId() {
return deptId;
}
public void setDeptId(Long deptId) {
this.deptId = deptId;
}
/**
* 部门
*/
private Long deptId;
public void setID(Long ID) public void setID(Long ID)
{ {
this.ID = ID; this.ID = ID;
@ -302,6 +315,7 @@ public class TdTrain extends BaseEntity
.append("trainTimeend", getTrainTimeend()) .append("trainTimeend", getTrainTimeend())
.append("PART", getPART()) .append("PART", getPART())
.append("TRAININFO", getTRAININFO()) .append("TRAININFO", getTRAININFO())
.append("deptId", getDeptId())
.toString(); .toString();
} }
} }

7
ruoyi-system/src/main/resources/mapper/system/TdLeaveMapper.xml
Unescape View File

@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="examinename" column="examinename" /> <result property="examinename" column="examinename" />
<result property="examinedate" column="examinedate" /> <result property="examinedate" column="examinedate" />
<result property="examinestate" column="examinestate" /> <result property="examinestate" column="examinestate" />
<result property="deptId" column="dept_id" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<sql id="selectTdLeaveVo"> <sql id="selectTdLeaveVo">
select u.id, u.user_id, u.user_name, u.country, u.areaname, u.leavereason, u.depart, u.leavedate, u.workstate, u.leavestate, u.examinename, u.examinedate, u.examinestate from td_leave u select u.id, u.user_id, u.user_name, u.country, u.areaname, u.leavereason, u.depart, u.leavedate, u.workstate, u.leavestate, u.examinename, u.examinedate, u.examinestate,dept_id from td_leave u
</sql> </sql>
<select id="selectTdLeaveList" parameterType="TdLeave" resultMap="TdLeaveResult"> <select id="selectTdLeaveList" parameterType="TdLeave" resultMap="TdLeaveResult">
<include refid="selectTdLeaveVo"/> <include refid="selectTdLeaveVo"/>
@ -38,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="examinename != null and examinename != ''"> and u.examinename like concat('%', #{examinename}, '%')</if> <if test="examinename != null and examinename != ''"> and u.examinename like concat('%', #{examinename}, '%')</if>
<if test="examinedate != null "> and u.examinedate = #{examinedate}</if> <if test="examinedate != null "> and u.examinedate = #{examinedate}</if>
<if test="examinestate != null and examinestate != ''"> and u.examinestate = #{examinestate}</if> <if test="examinestate != null and examinestate != ''"> and u.examinestate = #{examinestate}</if>
<if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${params.dataScope} ${params.dataScope}
</trim> </trim>
@ -64,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="examinename != null">examinename,</if> <if test="examinename != null">examinename,</if>
<if test="examinedate != null">examinedate,</if> <if test="examinedate != null">examinedate,</if>
<if test="examinestate != null">examinestate,</if> <if test="examinestate != null">examinestate,</if>
<if test="deptId != null">dept_id,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null">#{userId},</if> <if test="userId != null">#{userId},</if>
@ -78,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="examinename != null">#{examinename},</if> <if test="examinename != null">#{examinename},</if>
<if test="examinedate != null">#{examinedate},</if> <if test="examinedate != null">#{examinedate},</if>
<if test="examinestate != null">#{examinestate},</if> <if test="examinestate != null">#{examinestate},</if>
<if test="deptId != null">#{deptId},</if>
</trim> </trim>
</insert> </insert>
@ -96,6 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="examinename != null">examinename = #{examinename},</if> <if test="examinename != null">examinename = #{examinename},</if>
<if test="examinedate != null">examinedate = #{examinedate},</if> <if test="examinedate != null">examinedate = #{examinedate},</if>
<if test="examinestate != null">examinestate = #{examinestate},</if> <if test="examinestate != null">examinestate = #{examinestate},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
</trim> </trim>
where id = #{id} where id = #{id}
</update> </update>

7
ruoyi-system/src/main/resources/mapper/system/TdTrainMapper.xml
Unescape View File

@ -25,10 +25,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="trainTimeend" column="TRAIN_TIMEEND" /> <result property="trainTimeend" column="TRAIN_TIMEEND" />
<result property="PART" column="PART" /> <result property="PART" column="PART" />
<result property="TRAININFO" column="TRAININFO" /> <result property="TRAININFO" column="TRAININFO" />
<result property="deptId" column="dept_id" jdbcType="INTEGER"/>
</resultMap> </resultMap>
<sql id="selectTdTrainVo"> <sql id="selectTdTrainVo">
select ID, USERNAME, DEPT_NAME, TRAIN_TYPE, TRAIN_SUBJECT, TRAIN_ADDRESS, TRAIN_DATE, CREATE_STAFFID, CREATE_DEPARTID, CREATE_DATE, UPDATE_DEPARTID, UPDATE_STAFFID, UPDATE_DATE, AREAID, FRAMEWORK, TRAIN_NAME, TRAIN_STATE, TRAIN_TIMEEND, PART, TRAININFO from td_train select ID, USERNAME, DEPT_NAME, TRAIN_TYPE, TRAIN_SUBJECT, TRAIN_ADDRESS, TRAIN_DATE, CREATE_STAFFID, CREATE_DEPARTID, CREATE_DATE, UPDATE_DEPARTID, UPDATE_STAFFID, UPDATE_DATE, AREAID, FRAMEWORK, TRAIN_NAME, TRAIN_STATE, TRAIN_TIMEEND, PART, TRAININFO,dept_id from td_train
</sql> </sql>
<select id="selectTdTrainList" parameterType="TdTrain" resultMap="TdTrainResult"> <select id="selectTdTrainList" parameterType="TdTrain" resultMap="TdTrainResult">
@ -53,6 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="trainTimeend != null "> and TRAIN_TIMEEND = #{trainTimeend}</if> <if test="trainTimeend != null "> and TRAIN_TIMEEND = #{trainTimeend}</if>
<if test="PART != null and PART != ''"> and PART = #{PART}</if> <if test="PART != null and PART != ''"> and PART = #{PART}</if>
<if test="TRAININFO != null and TRAININFO != ''"> and TRAININFO = #{TRAININFO}</if> <if test="TRAININFO != null and TRAININFO != ''"> and TRAININFO = #{TRAININFO}</if>
<if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
</where> </where>
order by CREATE_DATE desc order by CREATE_DATE desc
</select> </select>
@ -84,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="trainTimeend != null">TRAIN_TIMEEND,</if> <if test="trainTimeend != null">TRAIN_TIMEEND,</if>
<if test="PART != null">PART,</if> <if test="PART != null">PART,</if>
<if test="TRAININFO != null">TRAININFO,</if> <if test="TRAININFO != null">TRAININFO,</if>
<if test="deptId != null">dept_id,</if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="USERNAME != null">#{USERNAME},</if> <if test="USERNAME != null">#{USERNAME},</if>
@ -105,6 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="trainTimeend != null">#{trainTimeend},</if> <if test="trainTimeend != null">#{trainTimeend},</if>
<if test="PART != null">#{PART},</if> <if test="PART != null">#{PART},</if>
<if test="TRAININFO != null">#{TRAININFO},</if> <if test="TRAININFO != null">#{TRAININFO},</if>
<if test="deptId != null">#{deptId},</if>
</trim> </trim>
</insert> </insert>
@ -130,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="trainTimeend != null">TRAIN_TIMEEND = #{trainTimeend},</if> <if test="trainTimeend != null">TRAIN_TIMEEND = #{trainTimeend},</if>
<if test="PART != null">PART = #{PART},</if> <if test="PART != null">PART = #{PART},</if>
<if test="TRAININFO != null">TRAININFO = #{TRAININFO},</if> <if test="TRAININFO != null">TRAININFO = #{TRAININFO},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
</trim> </trim>
where ID = #{ID} where ID = #{ID}
</update> </update>

Write Preview
Loading…
Cancel
Save