diff --git a/src/main/resources/magic/api/惠州项目管理政务版/投资管理.ms b/src/main/resources/magic/api/惠州项目管理政务版/投资管理.ms index 7c0499c..f32e8b5 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" : 1690276037807, + "updateTime" : 1690543632559, "lock" : null, "createBy" : "admin", "updateBy" : "admin", @@ -28,6 +28,7 @@ BigDecimal paymentByMonth = db.selectValue("SELECT IFNULL(SUM(s.payment), 0) FRO BigDecimal applyAmountByMonth = db.selectValue("SELECT IFNULL(SUM(s.apply_payment), 0) FROM investment_apply a INNER JOIN investment_payment_stat s ON a.id = s.investment_apply_id WHERE DATE_FORMAT(apply_time, '%Y-%m') = DATE_FORMAT(now(), '%Y-%m') AND #projectalias") BigDecimal realPayAmountByMonth = db.selectValue("SELECT IFNULL(SUM(pay_amount), 0) FROM investment_payment WHERE DATE_FORMAT(pay_time, '%Y-%m') = DATE_FORMAT(now(), '%Y-%m') AND #project") BigDecimal totalAmount = db.selectValue("SELECT IFNULL(SUM(contract_amount), 0) FROM investment_contract WHERE #project") +BigDecimal totalAmountByYear = db.selectValue("SELECT IFNULL(SUM(contract_amount), 0) FROM investment_contract WHERE DATE_FORMAT(contract_time, '%Y') = DATE_FORMAT(now(), '%Y') AND #project") BigDecimal settlementAmount = db.selectValue("SELECT IFNULL(SUM(settlement_amount), 0) FROM investment_contract WHERE #project") BigDecimal settlementAmountByYear = db.selectValue("SELECT IFNULL(SUM(settlement_amount), 0) FROM investment_contract WHERE DATE_FORMAT(contract_time, '%Y') = DATE_FORMAT(now(), '%Y') AND #project") BigDecimal realPayAmountTotal = db.selectValue("SELECT IFNULL(SUM(pay_amount), 0) FROM investment_payment WHERE #project") @@ -47,7 +48,9 @@ result.put("payRatio", realPayAmountTotal == 0 ? 0 : realPayAmountTotal.divide(t result.put("paymentTotal", paymentTotal.divide(big)) result.put("applyAmountTotal", applyAmountTotal.divide(big)) result.put("settlementAmount", settlementAmount.divide(big)) +result.put("payRatio1", realPayAmountTotal == 0 ? 0 : realPayAmountTotal.divide(settlementAmount, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).doubleValue()) result.put("settlementAmountByYear", settlementAmountByYear.divide(big)) +result.put("payRatio2", realPayAmountByYear == 0 ? 0 : realPayAmountByYear.divide(totalAmountByYear, 4, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal("100")).doubleValue()) result.put("realPayAmountTotal", realPayAmountTotal.divide(big)) result.put("realPayAmountByYear", realPayAmountByYear.divide(big)) return result \ No newline at end of file diff --git a/src/main/resources/magic/api/惠州项目管理政务版/进度管理.ms b/src/main/resources/magic/api/惠州项目管理政务版/进度管理.ms index f281229..292913e 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" : 1690368615930, + "updateTime" : 1690368857741, "lock" : null, "createBy" : null, "updateBy" : "admin",