This commit is contained in:
jiask 2026-02-06 18:18:01 +08:00
parent 1e10fd13f4
commit fc4f70742c
1 changed files with 5 additions and 5 deletions

View File

@ -960,7 +960,7 @@
LEFT JOIN wf_info_record wir ON wte.ID = wir.SUP_ID
WHERE
wir.TYPE = 2
AND wtr.IS_ACTIVE = 1
AND wtr.IS_ACTIVE = 1 AND bp.IS_ACTIVE = 1
<if test="projectId != null and projectId != ''">
and wla.PROJECT = #{projectId}
</if>
@ -995,7 +995,7 @@
LEFT JOIN bm_company bc on bp.COMPANY_ID = bc.ID
LEFT JOIN wf_return_material_details wrd ON wtr.ID = wrd.TASK_ID
LEFT JOIN wf_info_record wir ON wrd.ID = wir.SUP_ID
WHERE wtr.IS_ACTIVE = 1 AND wir.TYPE = 4
WHERE wtr.IS_ACTIVE = 1 AND wir.TYPE = 4 AND bp.IS_ACTIVE = 1
<if test="projectId != null and projectId != ''">
and wla.PROJECT = #{projectId}
</if>
@ -1064,7 +1064,7 @@
LEFT JOIN wf_info_record wir ON wte.ID = wir.SUP_ID
WHERE
wir.TYPE = 2
AND wtr.IS_ACTIVE = 1
AND wtr.IS_ACTIVE = 1 AND bp.IS_ACTIVE = 1
GROUP BY
wla.ID UNION
SELECT
@ -1105,7 +1105,7 @@
LEFT JOIN wf_info_record wir ON wrd.ID = wir.SUP_ID
WHERE
wtr.IS_ACTIVE = 1
AND wir.TYPE = 4
AND wir.TYPE = 4 AND bp.IS_ACTIVE = 1
GROUP BY
wla.ID
) a
@ -1120,7 +1120,7 @@
</if>
</where>
GROUP BY
a.projectName
a.ID
order by diffCount,subName desc
</select>