Merge branch 'feature/form_statistics_05' into 'develop'

项目专题区域公司项目统计 包含集团问题

See merge request kunlun/xyst_dinas/xyst_dinas_backend!71

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

@@ -42,9 +42,9 @@
 						LEFT JOIN Contract AS contract ON contract.project = projectFiled.id 
 						AND contract.contractVersion  <> 999
 						LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = projectFiled.regionalCompany
-						AND xystOrganization.type <> 'GROUP_COMPANY' AND xystOrganization.discard  <> 1	
+						 AND xystOrganization.discard  <> 1	
 						WHERE 1=1  
-						
+						AND xystOrganization.type <> 'GROUP_COMPANY'
 						
 					) AS project
 					LEFT JOIN (
@@ -61,9 +61,9 @@
 						LEFT JOIN Contract AS contract ON contract.project = projectFiled.id  
 						AND contract.contractVersion  <> 999
 						LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = projectFiled.regionalCompany
-						AND xystOrganization.type <> 'GROUP_COMPANY'  AND xystOrganization.discard  <> 1	
+						AND xystOrganization.discard  <> 1	
 						WHERE 1=1 
-						
+						AND xystOrganization.type <> 'GROUP_COMPANY' 
 					) AS project1 ON project.ID = project1.ID 
 					AND project.createTime < project1.createTime 
 				WHERE