新查询组件无条件查询--回款明细、预付款及余额汇总、经营报表。

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

@@ -387,9 +387,7 @@
 					) AS decAmount ON decAmount.dealYear1 = AdvancePaymentAndBalanceSummary.dealYear
 					AND decAmount.regionalCompany1 = AdvancePaymentAndBalanceSummary.regionalCompany
 					) AS result
-					WHERE result.dealYear = :?year
-					AND result.regionalCompany = :?regionalCompanyId
-					ORDER BY :?totalGroupBy
+
 				</sql>
 		</template>
 	</content>

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

@@ -9,20 +9,29 @@
 	<define-version>1.0</define-version>
 	<content>
 		<template>
-			<sql-type>SQL</sql-type>
+			<sql-type>NPSQL</sql-type>
 			<sql>
+	define query queryCompletionOperationsDaily() begin
+
+		      SELECT
+			result.stationName AS stationName,
+			result.dinasTypeName AS dinasTypeName,
+			result.saleDealAmount AS saleDealAmount,
+			result.saleAmount AS saleAmount 
+			FROM
+			(
 		       SELECT
 				station.stationName AS stationName,
 				dinasType.dinasTypeName AS dinasTypeName,
 				SUM( salesSummary.saleDealAmount ) AS saleDealAmount,
-				SUM( salesSummary.saleAmount ) AS saleAmount 
+				SUM( salesSummary.saleAmount ) AS saleAmount,
+                salesSummary.dealTime as dealTime,
+				station.id as stationId
 			FROM
 				SalesSummary AS salesSummary
 				LEFT JOIN Station AS station ON station.id = salesSummary.station
 				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
-			WHERE
-				( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate ) 
-				AND station.id IN (  :?stationList  ) 
+			
 			GROUP BY
 				salesSummary.station,
 				salesSummary.dinasType 
@@ -31,14 +40,14 @@
 				station.stationName AS stationName,
 				'小计' AS dinasTypeName,
 				SUM( salesSummary.saleDealAmount ) AS saleDealAmount,
-				SUM( salesSummary.saleAmount ) AS saleAmount 
+				SUM( salesSummary.saleAmount ) AS saleAmount,
+                salesSummary.dealTime as dealTime,
+				station.id as stationId 
 			FROM
 				SalesSummary AS salesSummary
 				LEFT JOIN Station AS station ON station.id = salesSummary.station
 				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
-			WHERE
-				( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate ) 
-				AND station.id IN (  :?stationList  ) 
+			 
 			GROUP BY
 				salesSummary.station 
 			UNION ALL
@@ -46,16 +55,16 @@
 				'总计' AS stationName,
 				'———' AS dinasTypeName,
 				SUM( salesSummary.saleDealAmount ) AS saleDealAmount,
-				SUM( salesSummary.saleAmount ) AS saleAmount 
+				SUM( salesSummary.saleAmount ) AS saleAmount,
+                salesSummary.dealTime as dealTime,
+				station.id as stationId 
 			FROM
 				SalesSummary AS salesSummary
 				LEFT JOIN Station AS station ON station.id = salesSummary.station
 				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
-			WHERE
-				( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate ) 
-				AND station.id IN (  :?stationList  ) 
-			ORDER BY :?totalGroupBy , :?subtotalGroupBy ,
-				stationName
+			) AS result
+
+			END
 				</sql>
 		</template>
 	</content>

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

@@ -9,20 +9,29 @@
 	<define-version>1.0</define-version>
 	<content>
 		<template>
-			<sql-type>SQL</sql-type>
+			<sql-type>NPSQL</sql-type>
 			<sql>
-					SELECT
+				define query queryCompletionOperationsOther() begin
+			
+			SELECT
+			result.stationName AS stationName,
+			result.dinasTypeName AS dinasTypeName,
+			result.saleDealAmount AS saleDealAmount,
+			result.saleAmount AS saleAmount 
+			FROM
+			(
+		       SELECT
 				station.stationName AS stationName,
 				dinasType.dinasTypeName AS dinasTypeName,
-				( SUM( salesSummary.saleDealAmount )  / 1000 ) AS saleDealAmount,
-				( SUM( salesSummary.saleAmount ) / 1000  ) AS saleAmount 
+				( SUM( salesSummary.saleDealAmount )  / 1000 )  AS saleDealAmount,
+				( SUM( salesSummary.saleAmount )   / 1000 ) AS saleAmount,
+                salesSummary.dealTime as dealTime,
+				station.id as stationId
 			FROM
 				SalesSummary AS salesSummary
 				LEFT JOIN Station AS station ON station.id = salesSummary.station
 				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
-			WHERE
-				( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate ) 
-				AND station.id IN (  :?stationList  ) 
+			
 			GROUP BY
 				salesSummary.station,
 				salesSummary.dinasType 
@@ -30,32 +39,31 @@
 			SELECT
 				station.stationName AS stationName,
 				'小计' AS dinasTypeName,
-				( SUM( salesSummary.saleDealAmount ) / 1000 ) AS saleDealAmount,
-				( SUM( salesSummary.saleAmount ) / 1000  ) AS saleAmount 
+				( SUM( salesSummary.saleDealAmount )  / 1000 )  AS saleDealAmount,
+				( SUM( salesSummary.saleAmount )  / 1000 )  AS saleAmount,
+                salesSummary.dealTime as dealTime,
+				station.id as stationId 
 			FROM
 				SalesSummary AS salesSummary
 				LEFT JOIN Station AS station ON station.id = salesSummary.station
 				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
-			WHERE
-				( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate ) 
-				AND station.id IN (  :?stationList  ) 
+			 
 			GROUP BY
 				salesSummary.station 
 			UNION ALL
 			SELECT
 				'总计' AS stationName,
 				'———' AS dinasTypeName,
-				( SUM( salesSummary.saleDealAmount )  / 1000 ) AS saleDealAmount,
-				( SUM( salesSummary.saleAmount )  / 1000 )  AS saleAmount 
+				( SUM( salesSummary.saleDealAmount )  / 1000 )  AS saleDealAmount,
+				( SUM( salesSummary.saleAmount )   / 1000 ) AS saleAmount,
+                salesSummary.dealTime as dealTime,
+				station.id as stationId 
 			FROM
 				SalesSummary AS salesSummary
 				LEFT JOIN Station AS station ON station.id = salesSummary.station
 				LEFT JOIN DinasType AS dinasType ON dinasType.id = salesSummary.dinasType 
-			WHERE
-				( salesSummary.dealTime &gt;= :?startDate AND salesSummary.dealTime &lt;= :?endDate ) 
-				AND station.id IN (  :?stationList  ) 
-			ORDER BY  :?totalGroupBy , :?subtotalGroupBy ,
-				stationName
+			) AS result
+            end
 				</sql>
 		</template>
 	</content>

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

@@ -9,10 +9,10 @@
 	<define-version>1.0</define-version>
 	<content>
 		<template>
-			<sql-type>SQL</sql-type>
+			<sql-type>NPSQL</sql-type>
 			<sql>		
-		SELECT 
-			result.id AS id ,
+	define query queryCompletionPayment() begin
+		SELECT 		
 			result.createTime AS createTime ,
 			result.purchaseSandUnit AS purchaseSandUnit ,
 			result.project AS project ,
@@ -21,8 +21,8 @@
 			result.actualRefundAmount AS actualRefundAmount ,
 			result.remark  AS remark 
 			FROM
-			(SELECT
-				financeRefund.id AS id,
+			(
+			SELECT
 				financeRefund.createTime AS createTime,
 				purchaseSandCompanyon.NAME AS purchaseSandUnit,
 				projectFiled.projectName AS project,
@@ -31,19 +31,17 @@
 					WHEN financeRefund.fundType = 1 THEN
 					'保证金退费' ELSE '预付款退费' 
 				END AS fundType,
-				'-' AS rechargeAmount,
+				'' AS rechargeAmount,
 				financeRefund.actualRefundAmount AS actualRefundAmount,
 				financeRefund.refundExplain AS remark ,
 				financeRefund.regionalCompany AS regionalCompanyId,
-				purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
 				CASE WHEN financeRefund.fundType = 1 THEN 'DEPOSIT' ELSE 'ADVANCE' END  AS fundType1
 			FROM
 				FinanceRefund AS financeRefund
 				LEFT JOIN PurchaseSandCompany AS purchaseSandCompanyon ON purchaseSandCompanyon.id = financeRefund.purchaseSandCompany
-				LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = financeRefund.project 
+				LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = financeRefund.project
 				UNION ALL
 		    SELECT
-				artificialRecharge.id AS id,
 				artificialRecharge.createTime AS createTime,
 				purchaseSandCompanyon.NAME AS purchaseSandUnit,
 				projectFiled.projectName AS project,
@@ -53,17 +51,16 @@
 					'保证金充值' ELSE '预付款充值' 
 				END AS fundType,
 				artificialRecharge.rechargeAmount AS rechargeAmount,
-				'-' AS actualRefundAmount,
+				'' AS actualRefundAmount,
 				artificialRecharge.remark AS remark ,
 				artificialRecharge.regionalCompany AS regionalCompanyId,
-				purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
 				artificialRecharge.fundType AS fundType1 
 			FROM
 				ArtificialRecharge AS artificialRecharge
 				LEFT JOIN PurchaseSandCompany AS purchaseSandCompanyon ON purchaseSandCompanyon.id = artificialRecharge.purchaseSandUnit
-				LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = artificialRecharge.project UNION ALL
+				LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = artificialRecharge.project
+				UNION ALL
 			SELECT
-				expenseAdjust.id AS id,
 				expenseAdjust.createTime AS createTime,
 				purchaseSandCompanyon.NAME AS purchaseSandUnit,
 				projectFiled.projectName AS project,
@@ -74,30 +71,25 @@
 				END AS fundType,
 			CASE
 					
-					WHEN expenseAdjust.expenseAdjustAmount &gt;= '0' THEN
-				expenseAdjust.expenseAdjustAmount ELSE '-' 
+					WHEN expenseAdjust.expenseAdjustAmount &gt;=  0  THEN
+				expenseAdjust.expenseAdjustAmount ELSE 0.00 
 			END AS rechargeAmount,
 			CASE
 					
-					WHEN expenseAdjust.expenseAdjustAmount &lt;
-				'0' THEN
-					( - expenseAdjust.expenseAdjustAmount ) ELSE '-' 
+			WHEN expenseAdjust.expenseAdjustAmount &lt;  0 THEN
+					(0.00 - expenseAdjust.expenseAdjustAmount ) ELSE 0.00 
 					END AS actualRefundAmount,
 				expenseAdjust.remark AS remark,
 				expenseAdjust.regionalCompany AS regionalCompanyId,
-				purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
 				expenseAdjust.fundType AS fundType1  
 				FROM
 					ExpenseAdjust AS expenseAdjust
 					LEFT JOIN PurchaseSandCompany AS purchaseSandCompanyon ON purchaseSandCompanyon.id = expenseAdjust.purchaseSandUnit
 					LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = expenseAdjust.project 
-				 )  AS result 
-				WHERE result.regionalCompanyId = :?regionalCompanyId 
-				AND ( result.createTime &gt;= :?startDate AND result.createTime &lt;= :?endDate )				
-				AND result.purchaseSandCompanyonName LIKE :?purchaseSandCompanyonName			
-                AND result.project LIKE :?projectName
-				AND result.fundType1 = :?fundType
+				 
+			)  AS result 
 				ORDER BY result.createTime DESC
+				END
 		    </sql>
 		</template>
 	</content>

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

@@ -56,17 +56,6 @@
                         ],
                         "expand": false,
                         "columns": [
-                        	{
-                                "type": "VALUE",
-                                "title": "id",
-                                "key": "id",
-                                "columnType": {
-                                    "name" : "inner",
-                                    "data": {
-                                        "selected": true
-                                    }
-                                }
-                            },
                             {
                                 "type": "VALUE",
                                 "title": "时间",