|
|
@@ -25,6 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="score" column="score" />
|
|
|
<result property="overallComment" column="overall_comment" />
|
|
|
<result property="approveStatus" column="APPROVE_STATUS" />
|
|
|
+ <!-- 王子文 2022年4月22日 14点20分 -->
|
|
|
+ <!-- 添加 映射属性 dateOfCompletion -->
|
|
|
+ <result property="dateOfCompletion" column="date_of_completion" />
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectTStPlanVo">
|
|
|
@@ -32,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<!-- 王子文 2022年4月19日 10点28分 -->
|
|
|
<!-- 添加 表连接 sys_user u -->
|
|
|
<!-- 添加 结果字段 u.nick_name -->
|
|
|
- select suc.MENTOR_STAFF_ID, d.overall_comment, d.score, d.id, d.staff_id,d.APPROVE_STATUS, u.nick_name, d.plant_name, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.start_date, d.end_date, d.class_hour, d.class_content, d.study_state ,s.dept_name from t_st_plan d
|
|
|
+ select d.date_of_completion, suc.MENTOR_STAFF_ID, d.overall_comment, d.score, d.id, d.staff_id,d.APPROVE_STATUS, u.nick_name, d.plant_name, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.start_date, d.end_date, d.class_hour, d.class_content, d.study_state ,s.dept_name from t_st_plan d
|
|
|
left join sys_dept s on s.dept_id = d.dept_id
|
|
|
left join sys_user u on d.staff_id = u.staffid
|
|
|
left join T_ST_SUCCESSOR suc on d.STAFF_ID = suc.STAFF_ID
|
|
|
@@ -127,9 +130,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="classHour != null">class_hour = #{classHour},</if>
|
|
|
<if test="classContent != null">class_content = #{classContent},</if>
|
|
|
<if test="studyState != null">study_state = #{studyState},</if>
|
|
|
- <if test="score != null">score = #{score},</if>
|
|
|
- <if test="overallComment != null">overall_comment = #{overallComment},</if>
|
|
|
+ <if test="score != null">
|
|
|
+ score = #{score},
|
|
|
+ <!-- 王子文 2022年4月22日 添加 -->
|
|
|
+ <!-- 导师反馈的同时更新实际完成培训日期为当前日期 -->
|
|
|
+ date_of_completion = SYSDATE,
|
|
|
+ </if>
|
|
|
+ <if test="overallComment != null">overall_comment = #{overallComment}</if>
|
|
|
<if test="approveStatus != null">approve_status = #{approveStatus},</if>
|
|
|
+ <if test="dateOfCompletion != null"></if>
|
|
|
</trim>
|
|
|
where id = #{id}
|
|
|
</update>
|
wangggziwen