Commit 177c4fd6 by wukaiqiang

预付款及余额汇总提交

parent a59c4b7b
...@@ -44,6 +44,6 @@ public class AdvancePaymentBalanceSumSchedulerTaskRegister implements ServiceIn ...@@ -44,6 +44,6 @@ public class AdvancePaymentBalanceSumSchedulerTaskRegister implements ServiceIn
//scheduleService.scheduleTask(taskDetail, "0 0 1/23 * * ? *"); //scheduleService.scheduleTask(taskDetail, "0 0 1/23 * * ? *");
//测试使用 没分钟执行一次 //测试使用 没分钟执行一次
//scheduleService.scheduleTask(taskDetail, "0 0/5 * * * ? *"); //scheduleService.scheduleTask(taskDetail, "0 0/5 * * * ? *");
logger.info("销售汇总自动创建任务初始化成功!"); logger.info("预付款与结余汇总自动创建任务初始化成功!");
} }
} }
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<metadata xmlns="http://www.beecode.cn/schema/amino-metadata"> <metadata xmlns="http://www.beecode.cn/schema/amino-metadata">
<specification>1.0</specification> <specification>1.0</specification>
<id>6955f0bb-c150-4151-9b1b-553ae896106a</id> <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> <title>回款明细</title>
<description>回款明细</description> <description>回款明细</description>
<define>advanced.query.template</define> <define>advanced.query.template</define>
...@@ -28,6 +28,10 @@ ...@@ -28,6 +28,10 @@
ArtificialRecharge as artificialRecharge ArtificialRecharge as artificialRecharge
LEFT JOIN PurchaseSandCompany as purchaseSandCompanyon on purchaseSandCompanyon.id = artificialRecharge.purchaseSandUnit LEFT JOIN PurchaseSandCompany as purchaseSandCompanyon on purchaseSandCompanyon.id = artificialRecharge.purchaseSandUnit
LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = artificialRecharge.project 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 UNION ALL
SELECT SELECT
expenseAdjust.id as id, expenseAdjust.id as id,
...@@ -52,6 +56,10 @@ ...@@ -52,6 +56,10 @@
ExpenseAdjust as expenseAdjust ExpenseAdjust as expenseAdjust
LEFT JOIN PurchaseSandCompany as purchaseSandCompanyon on purchaseSandCompanyon.id = expenseAdjust.purchaseSandUnit LEFT JOIN PurchaseSandCompany as purchaseSandCompanyon on purchaseSandCompanyon.id = expenseAdjust.purchaseSandUnit
LEFT JOIN ProjectFiled AS projectFiled ON projectFiled.id = expenseAdjust.project 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 UNION ALL
SELECT SELECT
financeRefund.id as id, financeRefund.id as id,
...@@ -70,6 +78,10 @@ ...@@ -70,6 +78,10 @@
FinanceRefund as financeRefund FinanceRefund as financeRefund
LEFT JOIN PurchaseSandCompany as purchaseSandCompanyon on purchaseSandCompanyon.id = financeRefund.purchaseSandCompany 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
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 ORDER BY createTime DESC
</sql> </sql>
</template> </template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment