Merge branch 'feature/sales_record_sync' of…

Merge branch 'feature/sales_record_sync' of gitlab.beecode.cn:kunlun/xyst_dinas/xyst_dinas_backend into feature/sales_record_sync

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

@@ -49,7 +49,8 @@
 				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
 			 
 			GROUP BY
-				salesSummary.station 
+				salesSummary.station ,
+				salesSummary.dealTime
 			UNION ALL
 			SELECT
 				'总计' AS stationName,
@@ -61,7 +62,8 @@
 			FROM
 				SalesSummary AS salesSummary
 				LEFT JOIN Station AS station ON station.id = salesSummary.station
-				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
+				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType
+				GROUP BY salesSummary.dealTime
 			) AS result
 
 			END

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

@@ -88,7 +88,6 @@
 					LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = expenseAdjust.project 
 				 
 			)  AS result 
-			WHERE result.purchaseSandUnit LIKE @purchaseSandCompanyonName
 				ORDER BY result.createTime DESC
 				END
 		    </sql>

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

@@ -9,8 +9,9 @@
 	<define-version>1.0</define-version>
 	<content>
 		<template>
-			<sql-type>SQL</sql-type>
+			<sql-type>NPSQL</sql-type>
 			<sql>
+	define query queryCompletionSalesSummary() begin
 		SELECT
 			result.station AS station,
 			result.dinasType AS dinasType,
@@ -36,7 +37,7 @@
 				'--' as dinasType,
 				SUM(salesSummary.saleDealAmount) as saleDealAmount,
 				SUM(salesSummary.saleAmount) as saleAmount,
-				'--' as avgAmount,
+				'0.00' as avgAmount,
 				janAmount.janAmount1 as janAmount,
 				febAmount.febAmount1 as febAmount,
 				marAmount.marAmount1 as marAmount,
@@ -193,7 +194,7 @@
 				'小计' as dinasType,
 				SUM(salesSummary.saleDealAmount) as saleDealAmount,
 				SUM(salesSummary.saleAmount) as saleAmount,
-				'--' as avgAmount,
+				'0.00' as avgAmount,
 				janAmount.janAmount1 as janAmount,
 				febAmount.febAmount1 as febAmount,
 				marAmount.marAmount1 as marAmount,
@@ -356,7 +357,7 @@
 				) AS decAmount ON  decAmount.station1 = salesSummary.station
 				AND decAmount.dealYear1 = salesSummary.dealYear
 				GROUP BY salesSummary.station
-			UNION ALL
+				UNION ALL
 			SELECT
 				station.stationName as station,
 				dinasType.dinasTypeName as dinasType,
@@ -377,7 +378,7 @@
 				decAmount.decAmount1 as decAmount,
 				salesSummary.dealYear AS dealYear
 			FROM
-				SalesSummary salesSummary
+				SalesSummary AS salesSummary
 				LEFT JOIN Station AS station ON station.id = salesSummary.station 
 				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
 				LEFT JOIN (
@@ -536,8 +537,8 @@
 					GROUP BY salesSummary1.station,salesSummary1.dinasType
 				) AS decAmount ON  decAmount.station1 = salesSummary.station AND decAmount.dinasType1 = salesSummary.dinasType
 				AND decAmount.dealYear1 = salesSummary.dealYear 				
-				) AS result
-			
+			) AS result
+			END
 				</sql>
 		</template>
 	</content>