|
@@ -373,8 +373,6 @@
|
|
|
sys_user d ON a.create_id = d.id
|
|
|
LEFT JOIN t_f_flow_approve f ON
|
|
|
a.school_id = f.school_id and a.flow_id = f.flow_id
|
|
|
- LEFT JOIN t_f_flow_approve_log tffal ON
|
|
|
- a.school_id = tffal.school_id and a.flow_id = tffal.flow_id
|
|
|
LEFT JOIN
|
|
|
sys_org e ON a.teaching_room_id = e.id
|
|
|
<where>
|
|
@@ -386,7 +384,7 @@
|
|
|
from
|
|
|
ACT_HI_TASKINST aht
|
|
|
where
|
|
|
- aht.TASK_DEF_KEY_ <![CDATA[ <> ]]> 'usertask1'
|
|
|
+ aht.TASK_DEF_KEY_ <![CDATA[ <> ]]> 'usertask_default'
|
|
|
and aht.ASSIGNEE_ = cast(#{currentUserId} as char)
|
|
|
and aht.END_TIME_ is not null
|
|
|
union all
|
|
@@ -406,7 +404,7 @@
|
|
|
from
|
|
|
ACT_HI_TASKINST aht
|
|
|
where
|
|
|
- aht.TASK_DEF_KEY_ <![CDATA[ <> ]]> 'usertask1'
|
|
|
+ aht.TASK_DEF_KEY_ <![CDATA[ <> ]]> 'usertask_default'
|
|
|
and aht.ASSIGNEE_ is null
|
|
|
and aht.END_TIME_ is not null
|
|
|
and ahi.TASK_ID_ = aht.id_)
|
|
@@ -415,11 +413,6 @@
|
|
|
t.ID_ = temp.TASK_ID_
|
|
|
join t_exam_task_flow tetf on
|
|
|
tetf.flow_id = t.PROC_INST_ID_
|
|
|
- JOIN t_f_flow_approve_log tffal ON
|
|
|
- tffal.task_id = tetf.task_id
|
|
|
- where (tffal.primary_approve_id = #{currentUserId} or tffal.second_approve_id = #{currentUserId}
|
|
|
- OR tffal.three_approve_id = #{currentUserId}
|
|
|
- OR tffal.four_approve_id = #{currentUserId})) temp where temp.PROC_INST_ID_ = tetf.flow_id)
|
|
|
<if test="schoolId != null and schoolId != ''">
|
|
|
and a.school_id = #{schoolId}
|
|
|
</if>
|