修改回款明细统计格式

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

@@ -12,6 +12,16 @@
 			<sql-type>SQL</sql-type>
 			<sql>		
 		SELECT 
+			result.id AS id ,
+			result.createTime AS createTime ,
+			result.purchaseSandUnit AS purchaseSandUnit ,
+			result.project AS project ,
+			result.fundType AS fundType ,
+			result.rechargeAmount AS rechargeAmount ,
+			result.actualRefundAmount AS actualRefundAmount ,
+			result.remark  AS remark 
+			FROM
+			(SELECT
 				financeRefund.id AS id,
 				financeRefund.createTime AS createTime,
 				purchaseSandCompanyon.NAME AS purchaseSandUnit,
@@ -23,17 +33,15 @@
 				END AS fundType,
 				'-' AS rechargeAmount,
 				financeRefund.actualRefundAmount AS actualRefundAmount,
-				financeRefund.refundExplain AS remark 
+				financeRefund.refundExplain AS remark ,
+				financeRefund.regionalCompany AS regionalCompanyId,
+				purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
+				projectFiled.projectName AS projectName,
+				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 
-				WHERE
-				financeRefund.regionalCompany = :?regionalCompanyId 
-				AND ( financeRefund.createTime &gt;= :?startDate AND financeRefund.createTime &lt;= :?endDate ) 
-				AND purchaseSandCompanyon.NAME LIKE :?purchaseSandCompanyonName 
-				AND projectFiled.projectName LIKE :?projectName 
-				AND ( CASE WHEN 'DEPOSIT' = :?fundType THEN '1' ELSE '0' END ) = financeRefund.fundType 
 			UNION ALL
 		    SELECT
 				artificialRecharge.id AS id,
@@ -47,17 +55,15 @@
 				END AS fundType,
 				artificialRecharge.rechargeAmount AS rechargeAmount,
 				'-' AS actualRefundAmount,
-				artificialRecharge.remark AS remark 
+				artificialRecharge.remark AS remark ,
+				artificialRecharge.regionalCompany AS regionalCompanyId,
+				purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
+				projectFiled.projectName AS projectName,
+				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	 
-				WHERE
-				artificialRecharge.regionalCompany = :?regionalCompanyId 
-				AND ( artificialRecharge.createTime &gt;= :?startDate AND artificialRecharge.createTime &lt;= :?endDate ) 
-				AND purchaseSandCompanyon.NAME LIKE :?purchaseSandCompanyonName 
-				AND projectFiled.projectName LIKE :?projectName 
-				AND artificialRecharge.fundType = :?fundType 	 
 				UNION ALL
 			SELECT
 				expenseAdjust.id AS id,
@@ -80,18 +86,22 @@
 				'0' THEN
 					( - expenseAdjust.expenseAdjustAmount ) ELSE '-' 
 					END AS actualRefundAmount,
-				expenseAdjust.remark AS remark 
+				expenseAdjust.remark AS remark,
+				expenseAdjust.regionalCompany AS regionalCompanyId,
+				purchaseSandCompanyon.NAME AS purchaseSandCompanyonName,
+				projectFiled.projectName AS projectName,
+				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 
-				WHERE
-					expenseAdjust.regionalCompany = :?regionalCompanyId 
-					AND ( expenseAdjust.createTime &gt;= :?startDate AND expenseAdjust.createTime &lt;= :?endDate ) 
-				AND purchaseSandCompanyon.NAME LIKE :?purchaseSandCompanyonName 
-				AND projectFiled.projectName LIKE :?projectName 
-				AND expenseAdjust.fundType = :?fundType 
-				ORDER BY createTime DESC
+				 )  AS result 
+				WHERE result.regionalCompanyId = :?regionalCompanyId 
+				AND ( result.createTime &gt;= :?startDate AND result.createTime &lt;= :?endDate )				
+				AND result.purchaseSandCompanyonName LIKE :?purchaseSandCompanyonName			
+                AND result.projectName LIKE :?projectName
+				AND result.fundType1 = :?fundType
+				ORDER BY result.createTime DESC
 		    </sql>
 		</template>
 	</content>