|
|
@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<result property="description" column="description" />
|
|
|
<result property="unsafeStatus" column="unsafe_status" />
|
|
|
<result property="unsafeAction" column="unsafe_action" />
|
|
|
+ <result property="unsafeChoice" column="unsafe_choice" />
|
|
|
<result property="applyDate" column="apply_date" />
|
|
|
<result property="taskId" column="task_id" />
|
|
|
<result property="taskName" column="task_name" />
|
|
|
@@ -66,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
d.applicant, d.assessor, d.executor, d.inspectors, d.applicant_dept, d.applicant_team, d.description,
|
|
|
d.unsafe_status, d.unsafe_action, d.apply_date, d.task_id, d.task_name,d.remarks, d.ve_item_other,
|
|
|
d.handler, d.estimate_finish_date, d.actual_finish_date, d.reaction, d.ve_result,
|
|
|
- d.sai_level, d.category, d.remarks_assess, d.remarks_execute, d.work_area, d.sai_type, d.tpm_status
|
|
|
+ d.sai_level, d.category, d.remarks_assess, d.remarks_execute, d.work_area, d.sai_type, d.tpm_status, d.unsafe_choice
|
|
|
from t_eoeg_sai_apply d
|
|
|
left join sys_dept s on s.dept_id = d.dept_id
|
|
|
</sql>
|
|
|
@@ -80,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
and handler like concat(concat('%', #{currentUser}), '%')
|
|
|
and apply_status != 4
|
|
|
and apply_status != 5
|
|
|
+ and tpm_status != '现场已完成'
|
|
|
</if>
|
|
|
<if test="tab == 2">
|
|
|
and (handler like concat(concat('%', #{currentUser}), '%')
|
|
|
@@ -113,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="description != null and description != ''"> and description like concat(concat('%', #{description}), '%') </if>
|
|
|
<if test="unsafeStatus != null "> and unsafe_status = #{unsafeStatus}</if>
|
|
|
<if test="unsafeAction != null "> and unsafe_action = #{unsafeAction}</if>
|
|
|
+ <if test="unsafeChoice != null "> and unsafe_choice = #{unsafeChoice}</if>
|
|
|
<if test="applyDate != null "> and apply_date = #{applyDate}</if>
|
|
|
<if test="taskId != null and taskId != ''"> and task_id = #{taskId}</if>
|
|
|
<if test="taskName != null and taskName != ''"> and task_name like concat(concat('%', #{taskName}), '%')</if>
|
|
|
@@ -172,6 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="description != null">description,</if>
|
|
|
<if test="unsafeStatus != null">unsafe_status,</if>
|
|
|
<if test="unsafeAction != null">unsafe_action,</if>
|
|
|
+ <if test="unsafeChoice != null">unsafe_choice,</if>
|
|
|
<if test="applyDate != null">apply_date,</if>
|
|
|
<if test="taskId != null">task_id,</if>
|
|
|
<if test="taskName != null">task_name,</if>
|
|
|
@@ -210,6 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="description != null">#{description},</if>
|
|
|
<if test="unsafeStatus != null">#{unsafeStatus},</if>
|
|
|
<if test="unsafeAction != null">#{unsafeAction},</if>
|
|
|
+ <if test="unsafeChoice != null">#{unsafeChoice},</if>
|
|
|
<if test="applyDate != null">#{applyDate},</if>
|
|
|
<if test="taskId != null">#{taskId},</if>
|
|
|
<if test="taskName != null">#{taskName},</if>
|
|
|
@@ -253,6 +258,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="unsafeStatus == null">unsafe_status = null,</if>
|
|
|
<if test="unsafeAction != null">unsafe_action = #{unsafeAction},</if>
|
|
|
<if test="unsafeAction == null">unsafe_action = null,</if>
|
|
|
+ <if test="unsafeChoice != null">unsafe_choice = #{unsafeChoice},</if>
|
|
|
<if test="applyDate != null">apply_date = #{applyDate},</if>
|
|
|
<if test="taskId != null">task_id = #{taskId},</if>
|
|
|
<if test="taskId == null">task_id = null,</if>
|
wangggziwen