Merge remote-tracking branch '惠信/qms/develop' into qms/develop
This commit is contained in:
commit
be7f130476
|
|
@ -105,14 +105,16 @@
|
||||||
LEFT JOIN "user" ua ON ua.id = t.assistant_id
|
LEFT JOIN "user" ua ON ua.id = t.assistant_id
|
||||||
LEFT JOIN qms_issue_ticket it ON it.source_type = 1 AND it.source_id = t.id
|
LEFT JOIN qms_issue_ticket it ON it.source_type = 1 AND it.source_id = t.id
|
||||||
<where>
|
<where>
|
||||||
<!-- 固定条件:已完成/待流转 + 不合格 + 存在不合格检测项 -->
|
<!-- 固定条件:已完成/待流转,且(总体不合格 或 存在不合格检测项) -->
|
||||||
AND t.inspection_enable IN (2, 3)
|
AND t.inspection_enable IN (2, 3)
|
||||||
AND t.inspection_inspection = false
|
AND (
|
||||||
AND EXISTS (
|
t.inspection_inspection = false
|
||||||
SELECT 1
|
OR EXISTS (
|
||||||
FROM qms_pdi_inspection_results ir
|
SELECT 1
|
||||||
WHERE ir.task_id = t.id
|
FROM qms_pdi_inspection_results ir
|
||||||
AND ir.inspection_item_results = false
|
WHERE ir.task_id = t.id
|
||||||
|
AND ir.inspection_item_results = false
|
||||||
|
)
|
||||||
)
|
)
|
||||||
<if test="request.inspectionType != null">
|
<if test="request.inspectionType != null">
|
||||||
AND r.inspection_type = #{request.inspectionType}
|
AND r.inspection_type = #{request.inspectionType}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue