Merge branch 'feature/form_statistics_05' into 'develop'

修改砂石种类条件重复问题

See merge request kunlun/xyst_dinas/xyst_dinas_backend!53

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

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
 	<specification>1.0</specification>
-	<id>40b86917-b139-4f81-8099-2d1fed22df3a</id>
+	<id>7f36c52c-7b4d-4f97-9bc0-2814b18c1642</id>
 	<name>com.xyst.dinas.statistics.advanquery.ContractDinasTypeStatisticsAdvQuery</name>
 	<title>砂石种类统计</title>
 	<description>砂石种类统计</description>
@@ -20,7 +20,7 @@
 				ContractAssociatedcontractDetail AS contractAssociatedcontractDetail
 				LEFT JOIN DinasType AS dinasType ON contractAssociatedcontractDetail.dinasType = dinasType.id 
 			    LEFT JOIN Contract AS contract on contractAssociatedcontractDetail.master = contract.id
-			    WHERE WHERE 1=1
+			    WHERE  1=1
 			    AND contract.approveState = 2
 			    AND contract.contractState &lt;&gt; 'MODIFIED'
 			    AND contract.regionalCompany = :?regionalCompany

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

 <?xml version="1.0" encoding="UTF-8"?>
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
 	<specification>1.0</specification>
-	<id>455a724a-ef32-4ad6-b1e4-9fb894b6fcde</id>
+	<id>1a93f1c8-d161-496a-855e-f40866fd68f3</id>
 	<name>com.xyst.dinas.statistics.advanquery.ContractDinasTypeStatisticsQueryView</name>
 	<title>砂石种类统计</title>
 	<description>砂石种类统计</description>