Merge branch 'feature/form_statistics_05' into 'develop'

修改区域公司去除总公司ID

See merge request kunlun/xyst_dinas/xyst_dinas_backend!58

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

@@ -95,6 +95,7 @@
 				project.regionalCompany 
 				) AS projectNumber ON projectNumber.regionalCompany = xystOrganization.id
 				WHERE 1=1
+				AND xystOrganization.type <> 'GROUP_COMPANY'
 				AND xystOrganization.id = :?regionalCompany
 			</sql>
 		</template>

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

@@ -41,6 +41,7 @@
 						LEFT JOIN ProjectType AS projectType ON projectFiled.projectType = projectType.id
 						LEFT JOIN Contract AS contract ON contract.project = projectFiled.id 
 						LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = projectFiled.regionalCompany
+						WHERE 1=1 AND xystOrganization.type <> 'GROUP_COMPANY'
 					) AS project
 					LEFT JOIN (
 					SELECT
@@ -55,6 +56,7 @@
 						LEFT JOIN ProjectType AS projectType ON projectFiled.projectType = projectType.id
 						LEFT JOIN Contract AS contract ON contract.project = projectFiled.id 
 						LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = projectFiled.regionalCompany
+						WHERE 1=1 AND xystOrganization.type <> 'GROUP_COMPANY'
 					) AS project1 ON project.ID = project1.ID 
 					AND project.createTime < project1.createTime 
 				WHERE

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

@@ -27,6 +27,7 @@
 					SalesRecord AS salesRecord
 					LEFT JOIN xystOrganization AS xystOrganization on xystOrganization.id = salesRecord.regionalCompany
 					WHERE 1=1
+					    AND xystOrganization.type <> 'GROUP_COMPANY'
 						AND salesRecord.syncTime >= :?startDate
 						AND salesRecord.syncTime <= :?endDate
 						AND salesRecord.regionalCompany = :?regionalCompany

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

@@ -26,8 +26,9 @@
 			  DinasType AS dinasType
 			  JOIN  xystOrganization AS xystOrganization ON 1=1
 			  LEFT JOIN SalesRecord AS salesRecord ON salesRecord.dinasType = dinasType.id 
-			  and xystOrganization.id = salesRecord.regionalCompany
+			  AND xystOrganization.id = salesRecord.regionalCompany
 			  WHERE 1=1
+			        AND xystOrganization.type <> 'GROUP_COMPANY'
 					AND salesRecord.syncTime >= :?startDate
 					AND salesRecord.syncTime <= :?endDate
 			  GROUP BY

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

@@ -19,6 +19,7 @@
 				LEFT JOIN Station AS station on station.id = salesSummary.station
 			    LEFT JOIN xystOrganization AS xystOrganization ON xystOrganization.id = station.regionalCompany
 			WHERE 1=1
+			AND xystOrganization.type <> 'GROUP_COMPANY'
 			AND salesSummary.dealTime >= :?startDate 
 			AND salesSummary.dealTime <= :?endDate
 			GROUP BY station.regionalCompany