Merge branch 'feature/form_statistics_05' into 'develop'

项目专题砂石总量数据计算规则调整

See merge request kunlun/xyst_dinas/xyst_dinas_backend!81

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

@@ -12,19 +12,16 @@
 			<sql-type>SQL</sql-type>
 			<sql>
 			SELECT
-				sum( contractDetail.purchaseAmount ) AS weight,
+				sum( projectFiledAssociatedProjectFiledDinasDetail.weight ) AS weight,
 				CASE 
 				WHEN dinasType.type = 0 THEN
 					'砂' ELSE  '石' 
 				END AS dinasTypeName 
 			FROM
 				ProjectFiled AS projectFiled
-				LEFT JOIN Contract AS contract ON contract.project = projectFiled.id
-				AND contract.approveState = 2 
-				AND contract.discard  &lt;&gt; 1
-				AND contract.contractState &lt;&gt; 'MODIFIED'
-				LEFT JOIN ContractAssociatedcontractDetail AS contractDetail ON contractDetail.master = contract.id
-				LEFT JOIN DinasType AS dinasType ON contractDetail.dinasType = dinasType.id 
+				LEFT JOIN ProjectFiledAssociatedProjectFiledDinasDetail AS projectFiledAssociatedProjectFiledDinasDetail
+				ON projectFiledAssociatedProjectFiledDinasDetail.master = projectFiled.id	
+				LEFT JOIN DinasType AS dinasType ON projectFiledAssociatedProjectFiledDinasDetail.dinasType = dinasType.id 
 				WHERE 1=1 AND dinasType.type IS NOT NULL
 				AND projectFiled.regionalCompany = :?regionalCompany
 				AND projectFiled.discard  &lt;&gt; 1