|
|
@@ -23,10 +23,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="updateTime" column="update_time" />
|
|
|
<result property="deptId" column="dept_id" />
|
|
|
<result property="isSigned" column="is_signed" />
|
|
|
+ <result property="completeTime" column="complete_time" />
|
|
|
+ <result property="signTime" column="sign_time" />
|
|
|
</resultMap>
|
|
|
|
|
|
<sql id="selectTBranchLearningVo">
|
|
|
- select u.learning_id, u.is_signed, u.user_id, u.file_id, u.learning_status, u.learning_time_required, u.learning_time_studied, u.learning_progress, u.learning_deadline, u.del_flag, u.create_by, u.create_time, u.update_by, u.update_time, u.dept_id,
|
|
|
+ select u.learning_id, u.is_signed, u.user_id, u.file_id, u.learning_status, u.learning_time_required,
|
|
|
+ u.learning_time_studied, u.learning_progress, u.learning_deadline, u.del_flag, u.create_by, u.create_time,
|
|
|
+ u.update_by, u.update_time, u.dept_id, u.complete_time, u.sign_time,
|
|
|
us.nick_name,
|
|
|
f.name as file_name, f.url as file_url
|
|
|
from t_branch_learning u
|
|
|
@@ -48,6 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="learningDeadline != null and learningDeadline != ''"> and u.learning_deadline = #{learningDeadline}</if>
|
|
|
<if test="deptId != null "> and u.dept_id = #{deptId}</if>
|
|
|
<if test="isSigned != null "> and u.is_signed = #{isSigned}</if>
|
|
|
+ <if test="completeTime != null "> and u.complete_time = #{completeTime}</if>
|
|
|
+ <if test="signTime != null "> and u.sign_time = #{signTime}</if>
|
|
|
and u.del_flag = 0
|
|
|
</where>
|
|
|
<!-- 数据范围过滤 -->
|
|
|
@@ -82,6 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="updateTime != null">update_time,</if>
|
|
|
<if test="deptId != null">dept_id,</if>
|
|
|
<if test="isSigned != null">is_signed,</if>
|
|
|
+ <if test="completeTime != null">complete_time,</if>
|
|
|
+ <if test="signTime != null">sign_time,</if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="learningId != null">#{learningId},</if>
|
|
|
@@ -99,6 +107,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="updateTime != null">#{updateTime},</if>
|
|
|
<if test="deptId != null">#{deptId},</if>
|
|
|
<if test="isSigned != null">#{isSigned},</if>
|
|
|
+ <if test="completeTime != null">#{completeTime},</if>
|
|
|
+ <if test="signTime != null">#{signTime},</if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
|
|
|
@@ -119,6 +129,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="updateTime != null">update_time = #{updateTime},</if>
|
|
|
<if test="deptId != null">dept_id = #{deptId},</if>
|
|
|
<if test="isSigned != null">is_signed = #{isSigned},</if>
|
|
|
+ <if test="completeTime != null">complete_time = #{completeTime},</if>
|
|
|
+ <if test="signTime != null">sign_time = #{signTime},</if>
|
|
|
</trim>
|
|
|
where learning_id = #{learningId}
|
|
|
</update>
|
