Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
694c169e48
|
|
@ -617,13 +617,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
mt.parent_id,
|
mt.parent_id,
|
||||||
mt.unit_name as unitNames,
|
mt.unit_name as unitNames,
|
||||||
mt.company_id,
|
mt.company_id,
|
||||||
SUM( CASE WHEN sai.agreement_id = 78 AND sai.STATUS = '0' THEN sai.num ELSE 0 END ) AS num,
|
SUM( CASE WHEN sai.agreement_id = #{agreementId} AND sai.STATUS = '0' THEN sai.num ELSE 0 END ) AS num,
|
||||||
mt.LEVEL
|
mt.LEVEL
|
||||||
FROM
|
FROM
|
||||||
ma_type mt
|
ma_type mt
|
||||||
LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id
|
LEFT JOIN slt_agreement_info sai ON mt.type_id = sai.type_id
|
||||||
WHERE
|
WHERE
|
||||||
EXISTS ( SELECT 1 FROM slt_agreement_info sai2 WHERE sai2.type_id = mt.type_id AND sai2.agreement_id = 78 AND sai2.STATUS = '0' and sai.lease_type = 0)
|
EXISTS ( SELECT 1 FROM slt_agreement_info sai2 WHERE sai2.type_id = mt.type_id AND sai2.agreement_id = #{agreementId} AND sai2.STATUS = '0' and sai.lease_type = 0)
|
||||||
GROUP BY
|
GROUP BY
|
||||||
mt.type_id
|
mt.type_id
|
||||||
</select>
|
</select>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue