|
@@ -489,7 +489,7 @@
|
|
FROM
|
|
FROM
|
|
u_archive_file uaf
|
|
u_archive_file uaf
|
|
LEFT JOIN m_archive_tree_contract matc ON uaf.node_id = matc.id
|
|
LEFT JOIN m_archive_tree_contract matc ON uaf.node_id = matc.id
|
|
- left join m_contract_info mci on matc.tree_code = mci.id
|
|
|
|
|
|
+ left join m_contract_info mci on matc.tree_code = mci.id and mci.is_deleted = 0
|
|
WHERE
|
|
WHERE
|
|
uaf.project_id = #{projectId}
|
|
uaf.project_id = #{projectId}
|
|
AND matc.is_deleted = 0
|
|
AND matc.is_deleted = 0
|
|
@@ -509,11 +509,8 @@
|
|
select sum(a.key1 + a.key11) key1,sum(a.key2 + a.key12) key2,sum(a.key3 +a.key13) key3 ,a.key4,a.key5,a.key6 from (
|
|
select sum(a.key1 + a.key11) key1,sum(a.key2 + a.key12) key2,sum(a.key3 +a.key13) key3 ,a.key4,a.key5,a.key6 from (
|
|
SELECT
|
|
SELECT
|
|
|
|
|
|
- sum(matc.tree_code is null) key4,
|
|
|
|
sum(matc.tree_code is null) key3,
|
|
sum(matc.tree_code is null) key3,
|
|
- sum(matc.tree_code = 'S') key5,
|
|
|
|
sum(matc.tree_code = 'S') key2,
|
|
sum(matc.tree_code = 'S') key2,
|
|
- sum( matc.tree_code = 'C') key6,
|
|
|
|
sum(matc.tree_code = 'C') key1,
|
|
sum(matc.tree_code = 'C') key1,
|
|
sum(mci.contract_type = 1) key11,
|
|
sum(mci.contract_type = 1) key11,
|
|
sum(mci.contract_type = 2) key12,
|
|
sum(mci.contract_type = 2) key12,
|
|
@@ -521,7 +518,7 @@
|
|
|
|
|
|
FROM u_archives_auto uaa
|
|
FROM u_archives_auto uaa
|
|
left join m_archive_tree_contract matc on uaa.node_id = matc.id
|
|
left join m_archive_tree_contract matc on uaa.node_id = matc.id
|
|
- left join m_contract_info mci on matc.tree_code = mci.id
|
|
|
|
|
|
+ left join m_contract_info mci on matc.tree_code = mci.id and mci.is_deleted = 0
|
|
WHERE uaa.project_id = #{projectId} and uaa.is_deleted = 0
|
|
WHERE uaa.project_id = #{projectId} and uaa.is_deleted = 0
|
|
) a
|
|
) a
|
|
|
|
|