Merge branch 'feature/form_statistics_05' into 'develop'

修改近半年购砂单位间断问题

See merge request kunlun/xyst_dinas/xyst_dinas_backend!68

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

@@ -12,20 +12,34 @@
 			<sql-type>SQL</sql-type>
 			<sql>
 			select 
-	            yearof(purchaseSandCompany.createTime ) AS year,
-				monthof(purchaseSandCompany.createTime) AS month,
-				COUNT(1) AS purchaseSandCompanyConcat
+	            yearof(planningCycle.startTime ) AS year,
+				monthof(planningCycle.startTime) AS month,
+				COUNT(results.purchaseSandCompanyId) AS purchaseSandCompanyConcat
 				FROM
+				PlanningCycle AS planningCycle
+				LEFT JOIN
+				(
+				SELECT 
+				purchaseSandCompany.createTime AS createTime,
+				purchaseSandCompany.id AS purchaseSandCompanyId
+				from
 				PurchaseSandCompany AS purchaseSandCompany
 				LEFT JOIN xystOrganization AS xystOrganization ON purchaseSandCompany.regionalCompany = xystOrganization.id
 				WHERE 1=1
 				AND xystOrganization.type  &lt;&gt; 'GROUP_COMPANY'
 				AND purchaseSandCompany.discard  &lt;&gt; 1
-				AND purchaseSandCompany.createTime &gt;= :?startDate
-				AND purchaseSandCompany.createTime &lt;= :?endDate 
 				AND purchaseSandCompany.regionalCompany = :?regionalCompanyId
-				GROUP BY yearof(purchaseSandCompany.createTime ),
-				         monthof(purchaseSandCompany.createTime)
+				) AS results ON 1=1
+				AND yearof(planningCycle.startTime ) = yearof(results.createTime )
+				AND monthof(planningCycle.startTime) = monthof(results.createTime)
+				AND dayof(planningCycle.startTime) = dayof(results.createTime)
+				WHERE
+				1=1
+				AND planningCycle.cycleType &lt;&gt; 'WEEK'
+				AND planningCycle.startTime &gt;= :?startDate
+				AND planningCycle.startTime &lt;= :?endDate 
+				GROUP BY yearof(planningCycle.startTime ),
+				         monthof(planningCycle.startTime)
 				</sql>
 		</template>
 	</content>