From 13c1c9ac8b835e5440cb0bc410ec695f7e015357 Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Mon, 24 Jun 2024 11:14:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=8C=E6=94=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/magic/api/惠州项目管理政务版/投资管理.ms | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/magic/api/惠州项目管理政务版/投资管理.ms b/src/main/resources/magic/api/惠州项目管理政务版/投资管理.ms index df2e581..788106b 100644 --- a/src/main/resources/magic/api/惠州项目管理政务版/投资管理.ms +++ b/src/main/resources/magic/api/惠州项目管理政务版/投资管理.ms @@ -5,7 +5,7 @@ "groupId" : "1f3d3e5b9fe340bab84de67b0de08f44", "name" : "投资管理", "createTime" : null, - "updateTime" : 1718961018857, + "updateTime" : 1719198279945, "lock" : null, "createBy" : "admin", "updateBy" : "admin", @@ -42,7 +42,7 @@ var cost = map.get("cost"); BigDecimal costTotal = new BigDecimal(cost).divide(new BigDecimal(10000), 2, BigDecimal.ROUND_HALF_UP) result.put("total", costTotal); List list = db.select("SELECT * FROM investment_plan WHERE #project") -BigDecimal totalCost = db.selectValue("SELECT SUM(engineering_cost) FROM engineering WHERE DATE_FORMAT(start_time, '%Y') = DATE_FORMAT(now(), '%Y') AND #project") +BigDecimal totalCost = db.selectValue("SELECT IFNULL(SUM( engineering_cost ),0) FROM engineering WHERE DATE_FORMAT(start_time, '%Y') = DATE_FORMAT(now(), '%Y') AND #project") Map contractMap = db.selectOne("SELECT SUM(contract_amount) contractTotalAmount, SUM(settlement_amount) settlementAount FROM investment_contract WHERE #project") Map payMap = db.selectOne("SELECT SUM(a.total_amount) payTotal, SUM(c.contract_amount) amountTotal FROM investment_payment a INNER JOIN (SELECT MAX(id) id FROM investment_payment GROUP BY contract_id) b on a.id = b.id LEFT JOIN investment_contract c on a.contract_id = c.id WHERE c.settlement_amount IS NOT NULL AND #projectalias") BigDecimal big = new BigDecimal(10000);