Merge branch 'feature/form_statistics_05' into 'develop'

区域公司销售量统计（明细）修改查询方式

See merge request kunlun/xyst_dinas/xyst_dinas_backend!57

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

@@ -12,21 +12,27 @@
 			<sql-type>SQL</sql-type>
 			<sql>
 			SELECT
-				SUM( salesRecord.dealAmount ) AS dealAmount,
-				salesRecord.dinasType AS dinasType,
-				salesRecord.regionalCompany AS regionalCompany ,
-				dinasType.dinasTypeName AS dinasTypeName,
-				xystOrganization.name AS regionalCompanyName
-			FROM
-				SalesRecord AS salesRecord 
-				LEFT JOIN DinasType AS dinasType ON salesRecord.dinasType = dinasType.id
-				LEFT JOIN xystOrganization AS xystOrganization on xystOrganization.id = salesRecord.regionalCompany
-			WHERE 1=1
-				AND salesRecord.syncTime &gt;= :?startDate
-				AND salesRecord.syncTime &lt;= :?endDate
-			GROUP BY
-				salesRecord.dinasType ,
-				salesRecord.regionalCompany
+			    CASE
+				WHEN
+			      SUM(salesRecord.dealAmount) IS NULL THEN 0 
+				ELSE
+				 sum(salesRecord.dealAmount) 
+				END AS dealAmount,
+			    dinasType.id AS dinasType,
+			    xystOrganization.id AS regionalCompany,
+			    dinasType.dinasTypeName AS dinasTypeName,
+			    xystOrganization.name AS regionalCompanyName
+			  FROM
+			  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
+			  WHERE 1=1
+					AND salesRecord.syncTime &gt;= :?startDate
+					AND salesRecord.syncTime &lt;= :?endDate
+			  GROUP BY
+			  dinasType.id,
+			  xystOrganization.id
 			</sql>
 		</template>
 	</content>