Merge branch 'feature/form_statistics_05' into 'develop'

解决砂石销量趋势图中断问题

See merge request kunlun/xyst_dinas/xyst_dinas_backend!60

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

@@ -12,20 +12,29 @@
 			<sql-type>SQL</sql-type>
 			<sql>
 			SELECT
-				SUM(salesRecord.dealAmount) AS dealAmount,
+	          CASE 
+	          WHEN
+			    SUM(salesRecord.dealAmount) IS NULL THEN 0
+		        ELSE SUM(salesRecord.dealAmount)
+	          END AS dealAmount,
 				dinasType.dinasTypeName AS dinasTypeName,
-				salesRecord.dinasType AS dinasType,
-				yearof(salesRecord.dealTime) AS year,
-				monthof(salesRecord.dealTime) AS month,
-				dayof(salesRecord.dealTime) AS day
+				dinasType.id AS dinasType,
+				yearof(planningCycle.startTime) AS year,
+				monthof(planningCycle.startTime) AS month,
+				dayof(planningCycle.startTime) AS day
 			FROM
-				SalesRecord AS salesRecord
-				LEFT JOIN DinasType AS dinasType ON salesRecord.dinasType = dinasType.id
+			DinasType AS dinasType
+			JOIN PlanningCycle AS planningCycle ON 1=1
+			LEFT JOIN SalesRecord AS salesRecord ON salesRecord.dinasType = dinasType.id 
+			AND yearof(salesRecord.dealTime) = yearof(planningCycle.startTime)
+			AND monthof(salesRecord.dealTime) = monthof(planningCycle.startTime)
+			AND dayof(salesRecord.dealTime) = dayof(planningCycle.startTime) 
 				WHERE 1=1
-				AND salesRecord.syncTime &gt;= :?startDate
-				AND salesRecord.syncTime &lt;= :?endDate
+				AND planningCycle.cycleType &lt;&gt; 'WEEK'
+				AND planningCycle.startTime &gt;= :?startDate
+				AND planningCycle.startTime &lt;= :?endDate
 				AND salesRecord.regionalCompany = :?regionalCompany 
-				group by yearof(salesRecord.dealTime) , monthof(salesRecord.dealTime),dayof(salesRecord.dealTime)
+				group by dinasType.id,yearof(planningCycle.startTime) , monthof(planningCycle.startTime),dayof(planningCycle.startTime)
 			</sql>
 		</template>
 	</content>

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

@@ -12,20 +12,28 @@
 			<sql-type>SQL</sql-type>
 			<sql>
 			SELECT
-				SUM(salesRecord.dealAmount) AS dealAmount,
+	          CASE 
+	          WHEN
+			    SUM(salesRecord.dealAmount) IS NULL THEN 0
+		        ELSE SUM(salesRecord.dealAmount)
+	          END AS dealAmount,
 				dinasType.dinasTypeName AS dinasTypeName,
-				salesRecord.dinasType AS dinasType,
-				yearof(salesRecord.dealTime) AS year,
-				monthof(salesRecord.dealTime) AS month
-				
+				dinasType.id AS dinasType,
+				yearof(planningCycle.startTime) AS year,
+				monthof(planningCycle.startTime) AS month
 			FROM
-				SalesRecord AS salesRecord
-				LEFT JOIN DinasType AS dinasType ON salesRecord.dinasType = dinasType.id
+			DinasType AS dinasType
+			JOIN PlanningCycle AS planningCycle ON 1=1
+			LEFT JOIN SalesRecord AS salesRecord ON salesRecord.dinasType = dinasType.id 
+			AND yearof(salesRecord.dealTime) = yearof(planningCycle.startTime)
+			AND monthof(salesRecord.dealTime) = monthof(planningCycle.startTime)
+			AND dayof(salesRecord.dealTime) = dayof(planningCycle.startTime) 
 				WHERE 1=1
-				AND salesRecord.syncTime &gt;= :?startDate
-				AND salesRecord.syncTime &lt;= :?endDate
+				AND planningCycle.cycleType &lt;&gt; 'WEEK'
+				AND planningCycle.startTime &gt;= :?startDate
+				AND planningCycle.startTime &lt;= :?endDate
 				AND salesRecord.regionalCompany = :?regionalCompany 
-				group by yearof(salesRecord.dealTime) , monthof(salesRecord.dealTime)
+				group by  dinasType.id,yearof(planningCycle.startTime) , monthof(planningCycle.startTime)
 			</sql>
 		</template>
 	</content>

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

@@ -12,19 +12,27 @@
 			<sql-type>SQL</sql-type>
 			<sql>
 			SELECT
-				SUM(salesRecord.dealAmount) AS dealAmount,
+	          CASE 
+	          WHEN
+			    SUM(salesRecord.dealAmount) IS NULL THEN 0
+		        ELSE SUM(salesRecord.dealAmount)
+	          END AS dealAmount,
 				dinasType.dinasTypeName AS dinasTypeName,
-				salesRecord.dinasType AS dinasType,
-				yearof(salesRecord.dealTime) AS year
-				
+				dinasType.id AS dinasType,
+				yearof(planningCycle.startTime) AS year
 			FROM
-				SalesRecord AS salesRecord
-				LEFT JOIN DinasType AS dinasType ON salesRecord.dinasType = dinasType.id
+			DinasType AS dinasType
+			JOIN PlanningCycle AS planningCycle ON 1=1
+			LEFT JOIN SalesRecord AS salesRecord ON salesRecord.dinasType = dinasType.id 
+			AND yearof(salesRecord.dealTime) = yearof(planningCycle.startTime)
+			AND monthof(salesRecord.dealTime) = monthof(planningCycle.startTime)
+			AND dayof(salesRecord.dealTime) = dayof(planningCycle.startTime) 
 				WHERE 1=1
-				AND salesRecord.syncTime &gt;= :?startDate
-				AND salesRecord.syncTime &lt;= :?endDate
+				AND planningCycle.cycleType &lt;&gt; 'WEEK'
+				AND planningCycle.startTime &gt;= :?startDate
+				AND planningCycle.startTime &lt;= :?endDate
 				AND salesRecord.regionalCompany = :?regionalCompany 
-				group by yearof(salesRecord.dealTime)
+				group by dinasType.id,yearof(planningCycle.startTime) 
 			</sql>
 		</template>
 	</content>