Merge branch 'feature/form_statistics_05' into 'develop'

区域公司项目统计 去除区域公司为 null 的数据

See merge request kunlun/xyst_dinas/xyst_dinas_backend!59

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

@@ -26,7 +26,7 @@
 				FROM
 					(
 					SELECT
-						projectFiled.ID,
+						projectFiled.id as ID,
 						projectFiled.projectName AS projectName,
 					CASE
 							
@@ -45,7 +45,7 @@
 					) AS project
 					LEFT JOIN (
 					SELECT
-						projectFiled.ID,
+						projectFiled.id as ID,
 						projectFiled.projectName AS projectName,
 						contract.contractState AS contractState,
 						contract.createTime AS createTime ,
@@ -65,6 +65,7 @@
 					project.projectName 
 				) AS projectResult 
 				where 1=1
+				and projectResult.regionalCompany is not null
 				and projectResult.regionalCompany = :?regionalCompany
 			GROUP BY
 				projectResult.contractState,