预付款及余额汇总提交

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/statisticsquery/PaymentDetailsAdvQuery.jmx

@@ -2,7 +2,7 @@
 <metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
 	<specification>1.0</specification>
 	<id>6955f0bb-c150-4151-9b1b-553ae896106a</id>
-	<name>com.xyst.dinas.statistics.statisticsquery.PaymentDetailsAdvQuery</name>
+	<name>com.xyst.dinas.statistics.advanquery.PaymentDetailsAdvQuery</name>
 	<title>回款明细</title>
 	<description>回款明细</description>
 	<define>advanced.query.template</define>
@@ -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 &gt;= :?startDate AND  artificialRecharge.createTime &lt; :?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 &gt;= :?startDate AND  expenseAdjust.createTime &lt; :?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 &gt;= :?startDate AND  financeRefund.createTime &lt; :?endDate)
+	      AND purchaseSandCompanyon.name LIKE :?purchaseSandCompanyonName
+	      AND projectFiled.projectName LIKE :?projectName
 	      ORDER BY createTime DESC
 				</sql>
 		</template>