Merge branch 'feature/sales_record_sync' into 'develop'

Feature/sales record sync

See merge request kunlun/xyst_dinas/xyst_dinas_backend!8

backend/xyst.dinas.statistics/src/main/java/com/xyst/dinas/statistics/scheduler/AdvancePaymentBalanceSumSchedulerTaskRegister.java

@@ -44,6 +44,6 @@ public class AdvancePaymentBalanceSumSchedulerTaskRegister  implements ServiceIn
 		//scheduleService.scheduleTask(taskDetail, "0 0 1/23 * * ? *");	
 		//测试使用 没分钟执行一次
 		//scheduleService.scheduleTask(taskDetail, "0 0/5 * * * ? *");
-		logger.info("销售汇总自动创建任务初始化成功!");
+		logger.info("预付款与结余汇总自动创建任务初始化成功!");
 	}
 }

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

+<?xml version="1.0" encoding="UTF-8"?>
+<metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
+	<specification>1.0</specification>
+	<id>21639dfb-910e-4054-826a-e6f051faf965</id>
+	<name>com.xyst.dinas.statistics.advanquery.OperationsDailyReportsAdvQuery</name>
+	<title>回款明细</title>
+	<description>回款明细</description>
+	<define>advanced.query.template</define>
+	<define-version>1.0</define-version>
+	<content>
+		<template>
+			<sql-type>SQL</sql-type>
+			<sql>
+		 SELECT
+	        artificialRecharge.id as id,
+	        artificialRecharge.createTime AS createTime,
+	        purchaseSandCompanyon.name AS purchaseSandUnit,
+	        projectFiled.projectName AS project,
+	    CASE
+	    WHEN artificialRecharge.fundType ='DEPOSIT'  then '保证金充值'
+	    ELSE '预付款充值'
+	    END
+	       as  fundType,
+	       artificialRecharge.rechargeAmount AS rechargeAmount,
+	       '' AS actualRefundAmount,
+	       artificialRecharge.remark AS remark 
+	    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
+	     UNION ALL
+	   SELECT
+	      expenseAdjust.id as id,
+		  expenseAdjust.createTime AS createTime,
+		  purchaseSandCompanyon.name AS purchaseSandUnit,
+	      projectFiled.projectName AS project,	    
+	    CASE
+	    WHEN expenseAdjust.fundType ='DEPOSIT'  then '保证金费用调整'
+	    ELSE '预付款费用调整'
+	    END
+	       as fundType,
+	    CASE	
+		WHEN expenseAdjust.expenseAdjustAmount &gt;= '0' THEN
+		  expenseAdjust.expenseAdjustAmount ELSE '' 
+	    END AS expenseAdjustAmount,
+	    CASE	
+	    WHEN expenseAdjust.expenseAdjustAmount &lt; '0' 
+	    THEN (- expenseAdjust.expenseAdjustAmount) ELSE '' 
+		END AS actualRefundAmount,
+		   expenseAdjust.remark AS remark 
+		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
+		 UNION ALL
+		SELECT
+		    financeRefund.id as id,
+			financeRefund.createTime AS createTime,
+			purchaseSandCompanyon.name AS purchaseSandUnit,
+	        projectFiled.projectName AS project,	        
+		CASE
+	    WHEN financeRefund.fundType ='1'  THEN '保证金退费'
+	    ELSE '预付款退费'
+	    END
+	      as fundType,
+			'' AS rechargeAmount,
+			financeRefund.actualRefundAmount AS actualRefundAmount,
+			financeRefund.refundExplain AS remark 
+		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
+	      ORDER BY createTime DESC
+				</sql>
+		</template>
+	</content>
+</metadata>

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

@@ -28,6 +28,10 @@
 	     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 >= :?startDate AND  artificialRecharge.createTime < :?endDate)
+	     AND purchaseSandCompanyon.name LIKE :?purchaseSandCompanyonName
+	     AND projectFiled.projectName LIKE :?projectName
 	     UNION ALL
 	   SELECT
 	      expenseAdjust.id as id,
@@ -52,6 +56,10 @@
 			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 >= :?startDate AND  expenseAdjust.createTime < :?endDate)
+	        AND purchaseSandCompanyon.name LIKE :?purchaseSandCompanyonName
+	        AND projectFiled.projectName LIKE :?projectName
 		 UNION ALL
 		SELECT
 		    financeRefund.id as id,
@@ -70,6 +78,10 @@
 		  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 >= :?startDate AND  financeRefund.createTime < :?endDate)
+	      AND purchaseSandCompanyon.name LIKE :?purchaseSandCompanyonName
+	      AND projectFiled.projectName LIKE :?projectName
 	      ORDER BY createTime DESC
 				</sql>
 		</template>