查询优化

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

@@ -18,11 +18,13 @@
 			FROM
 				(select  
 				contract1.id as id ,
-				contract1.createTime as createTime
+				contract1.signDate as createTime
 				from Contract as contract1 
 				where 1=1
 				AND contract1.approveState = 2 
 				AND contract1.discard  <> 1
+				AND contract1.contractState <> 'MODIFIED'
+				AND contract1.contractVersion <> '999' 
 				AND contract1.regionalCompany = :?regionalCompany
 				)AS contract
 				RIGHT JOIN PlanningCycle AS planningCycle ON 1=1

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

@@ -148,6 +148,8 @@
 					 AND results.startTime >= :?startDate
 					 AND  results.startTime <= :?endDate 
 				     AND results.regionalCompanyId = :?regionalCompanyId
+				     ORDER BY results.startTime asc
+							   
 				</sql>
 		</template>
 	</content>

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

@@ -151,6 +151,8 @@
 				     GROUP BY results.regionalCompanyId ,
 				              yearof(results.startTime) ,
 							  monthof(results.startTime) 
+					ORDER BY 
+							  results.startTime asc
 				</sql>
 		</template>
 	</content>

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

@@ -148,6 +148,7 @@
 				     AND results.regionalCompanyId = :?regionalCompanyId
 				     GROUP BY results.regionalCompanyId ,
 				              yearof(results.startTime)
+				     ORDER BY yearof(results.startTime) DESC
 				</sql>
 		</template>
 	</content>

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

@@ -101,6 +101,7 @@
 						yearof(results.startTime ),
 						monthof(results.startTime) ,
 				        dayof(results.startTime )
+				  ORDER BY results.startTime	
 				</sql>
 		</template>
 	</content>

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

@@ -99,6 +99,7 @@
 				  GROUP BY  results.regionalCompanyId ,
 						yearof(results.startTime ),
 						monthof(results.startTime) 
+				ORDER BY results.startTime	
 				</sql>
 		</template>
 	</content>

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

@@ -97,6 +97,7 @@
 				     AND results.regionalCompanyId = :?regionalCompanyId
 				  GROUP BY  results.regionalCompanyId ,
 						yearof(results.startTime )
+				 ORDER BY results.startTime
 				</sql>
 		</template>
 	</content>