Commit d6cbdd73 by wukaiqiang

对于合同增加未审核通过变更的过滤条件 AND contract.contractVersion <> 999

parent 274502ba
......@@ -85,6 +85,7 @@
1 = 1
AND contract.DISCARD &lt;&gt; 1
AND contract.contractState = 'EXECUTING'
AND contract.contractVersion &lt;&gt; 999
GROUP BY
contract.regionalCompany,
contract.purchaseSandUnit
......@@ -104,6 +105,7 @@
1 = 1
AND contract.DISCARD &lt;&gt; 1
AND contract.contractState &lt;&gt; 'MODIFIED'
AND contract.contractVersion &lt;&gt; 999
GROUP BY
contract.regionalCompany,
contract.purchaseSandUnit
......@@ -127,13 +129,14 @@
1 = 1
AND contract.DISCARD &lt;&gt; 1
AND contract.contractState &lt;&gt; 'MODIFIED'
AND contract.contractVersion &lt;&gt; 999
GROUP BY
contract.project
) AS projectConcat
GROUP BY
projectConcat.regionalCompany,
projectConcat.purchaseSandUnit
) AS projectFiledConcat ON projectFiledConcat.regionalCompany = purchaseSandCompany.regionalCompany
) AS projectFiledConcat ON .regionalCompany = purchaseSandCompany.regionalCompany
AND projectFiledConcat.purchaseSandUnit = purchaseSandCompany.id
LEFT JOIN (
SELECT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment