|
@@ -1437,8 +1437,11 @@
|
|
|
</select>
|
|
</select>
|
|
|
|
|
|
|
|
<select id="listAvailableTaskForSupervision2" resultMap="wmTaskMap">
|
|
<select id="listAvailableTaskForSupervision2" resultMap="wmTaskMap">
|
|
|
- SELECT *
|
|
|
|
|
- FROM wm_task t
|
|
|
|
|
|
|
+ SELECT * FROM
|
|
|
|
|
+ (SELECT wm_task.*, f2099.target_id f2099id FROM wm_task
|
|
|
|
|
+ LEFT JOIN ops_freeze_task f2099
|
|
|
|
|
+ ON f2099.target_id = wm_task.id
|
|
|
|
|
+ ) t
|
|
|
RIGHT JOIN (SELECT DISTINCT h.target_id
|
|
RIGHT JOIN (SELECT DISTINCT h.target_id
|
|
|
FROM sys_chain_node_check_his h
|
|
FROM sys_chain_node_check_his h
|
|
|
WHERE h.node_id = 6
|
|
WHERE h.node_id = 6
|
|
@@ -1446,6 +1449,7 @@
|
|
|
) c ON c.target_id = t.id
|
|
) c ON c.target_id = t.id
|
|
|
<where>
|
|
<where>
|
|
|
t.task_status = '3'
|
|
t.task_status = '3'
|
|
|
|
|
+ AND t.f2099id is NULL
|
|
|
<if test="pkgIds != null and pkgIds.size > 0">
|
|
<if test="pkgIds != null and pkgIds.size > 0">
|
|
|
AND t.score_package_id IN
|
|
AND t.score_package_id IN
|
|
|
<foreach collection="pkgIds" item="id" open="(" separator="," close=")">
|
|
<foreach collection="pkgIds" item="id" open="(" separator="," close=")">
|
