Skip to content

C
cloud-fb
Commit 41c0616c by wukaiqiang
Options

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

parent d6530423
Showing with 54 additions and 29 deletions
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDinasTypeDealAmountTrendDayStatisticsAdvQuery.jmx
...@@ -12,20 +12,29 @@ ...@@ -12,20 +12,29 @@
<sql-type>SQL</sql-type> <sql-type>SQL</sql-type>
<sql> <sql>
SELECT 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, dinasType.dinasTypeName AS dinasTypeName,
salesRecord.dinasType AS dinasType, dinasType.id AS dinasType,
yearof(salesRecord.dealTime) AS year, yearof(planningCycle.startTime) AS year,
monthof(salesRecord.dealTime) AS month, monthof(planningCycle.startTime) AS month,
dayof(salesRecord.dealTime) AS day dayof(planningCycle.startTime) AS day
FROM FROM
SalesRecord AS salesRecord DinasType AS dinasType
LEFT JOIN DinasType AS dinasType ON salesRecord.dinasType = dinasType.id 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 WHERE 1=1
AND salesRecord.syncTime &gt;= :?startDate AND planningCycle.cycleType &lt;&gt; 'WEEK'
AND salesRecord.syncTime &lt;= :?endDate AND planningCycle.startTime &gt;= :?startDate
AND planningCycle.startTime &lt;= :?endDate
AND salesRecord.regionalCompany = :?regionalCompany 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> </sql>
</template> </template>
</content> </content>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDinasTypeDealAmountTrendMonthStatisticsAdvQuery.jmx
...@@ -12,20 +12,28 @@ ...@@ -12,20 +12,28 @@
<sql-type>SQL</sql-type> <sql-type>SQL</sql-type>
<sql> <sql>
SELECT 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, dinasType.dinasTypeName AS dinasTypeName,
salesRecord.dinasType AS dinasType, dinasType.id AS dinasType,
yearof(salesRecord.dealTime) AS year, yearof(planningCycle.startTime) AS year,
monthof(salesRecord.dealTime) AS month monthof(planningCycle.startTime) AS month
FROM FROM
SalesRecord AS salesRecord DinasType AS dinasType
LEFT JOIN DinasType AS dinasType ON salesRecord.dinasType = dinasType.id 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 WHERE 1=1
AND salesRecord.syncTime &gt;= :?startDate AND planningCycle.cycleType &lt;&gt; 'WEEK'
AND salesRecord.syncTime &lt;= :?endDate AND planningCycle.startTime &gt;= :?startDate
AND planningCycle.startTime &lt;= :?endDate
AND salesRecord.regionalCompany = :?regionalCompany AND salesRecord.regionalCompany = :?regionalCompany
group by yearof(salesRecord.dealTime) , monthof(salesRecord.dealTime) group by dinasType.id,yearof(planningCycle.startTime) , monthof(planningCycle.startTime)
</sql> </sql>
</template> </template>
</content> </content>
......
backend/xyst.dinas.statistics/src/main/resources/com/xyst/dinas/statistics/advanquery/SalesDinasTypeDealAmountTrendYearStatisticsAdvQuery.jmx
...@@ -12,19 +12,27 @@ ...@@ -12,19 +12,27 @@
<sql-type>SQL</sql-type> <sql-type>SQL</sql-type>
<sql> <sql>
SELECT 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, dinasType.dinasTypeName AS dinasTypeName,
salesRecord.dinasType AS dinasType, dinasType.id AS dinasType,
yearof(salesRecord.dealTime) AS year yearof(planningCycle.startTime) AS year
FROM FROM
SalesRecord AS salesRecord DinasType AS dinasType
LEFT JOIN DinasType AS dinasType ON salesRecord.dinasType = dinasType.id 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 WHERE 1=1
AND salesRecord.syncTime &gt;= :?startDate AND planningCycle.cycleType &lt;&gt; 'WEEK'
AND salesRecord.syncTime &lt;= :?endDate AND planningCycle.startTime &gt;= :?startDate
AND planningCycle.startTime &lt;= :?endDate
AND salesRecord.regionalCompany = :?regionalCompany AND salesRecord.regionalCompany = :?regionalCompany
group by yearof(salesRecord.dealTime) group by dinasType.id,yearof(planningCycle.startTime)
</sql> </sql>
</template> </template>
</content> </content>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment