Merge branch 'feature/form_statistics_05' into 'develop'

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

See merge request kunlun/xyst_dinas/xyst_dinas_backend!72

backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/PurchaseSandCompanyDetailsSummaryAdvQuery.jmx

@@ -85,6 +85,7 @@
 					1 = 1 
 					AND contract.DISCARD  <>  1 
 					AND contract.contractState = 'EXECUTING' 
+					AND contract.contractVersion <> 999
 				GROUP BY
 					contract.regionalCompany,
 					contract.purchaseSandUnit 
@@ -104,6 +105,7 @@
 					1 = 1 
 					AND contract.DISCARD  <>  1 
 					AND contract.contractState  <>  'MODIFIED' 
+					AND contract.contractVersion <> 999
 				GROUP BY
 					contract.regionalCompany,
 					contract.purchaseSandUnit 
@@ -127,13 +129,14 @@
 						1 = 1 
 						AND contract.DISCARD  <>  1 
 						AND contract.contractState  <>  'MODIFIED' 
+						AND contract.contractVersion <> 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