diff --git a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt index 3058f97..aa86e03 100644 --- a/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt +++ b/src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt @@ -1496,8 +1496,8 @@ open class DashboardService( } fun BeforeCurrentYearCashFlowMonthlyCumulativeExpenditure(args: Map): List> { - val sql = StringBuilder("" - + " select" + val sql = StringBuilder( + " select" + " coalesce (sum(result.expenditure),0) as beforeCurrentYearCumulativeExpenditure" + " from(" + " select" @@ -1544,6 +1544,26 @@ open class DashboardService( ) return jdbcDao.queryForList(sql.toString(), args) } + + fun BeforeCurrentYearCashFlowMonthlyCumulativeIncome(args: Map): List> { + val sql = StringBuilder( + " select" + + " coalesce (sum(result.income),0) as beforeCurrentYearCumulativeIncome" + + " from(" + + " select" + + " month(i.receiptDate) as invoiceMonth," + + " coalesce(sum(i.paidAmount),0) as income" + + " from project p" + + " left join invoice i on p.code = i.projectCode and i.deleted = 0 where p.status = 'On-going'" + + " and p.id in (1)" + + " and year(i.receiptDate) < 2025" + + " and i.id is not null" + + " group by month(i.receiptDate)" + + " ) as result" + ) + return jdbcDao.queryForList(sql.toString(), args) + } + fun CashFlowReceivableAndExpenditure(args: Map): List> { val sql = StringBuilder( // "select" diff --git a/src/main/java/com/ffii/tsms/modules/data/web/DashboardController.kt b/src/main/java/com/ffii/tsms/modules/data/web/DashboardController.kt index 017cb8f..83cffac 100644 --- a/src/main/java/com/ffii/tsms/modules/data/web/DashboardController.kt +++ b/src/main/java/com/ffii/tsms/modules/data/web/DashboardController.kt @@ -196,9 +196,11 @@ class DashboardController( val cashFlowMonthlyIncome = dashboardService.CashFlowMonthlyIncomeByMonth(args) val cashFlowMonthlyExpenditure = dashboardService.CashFlowMonthlyExpenditureByMonth(args) val beforeCurrentYearExpenditure = dashboardService.BeforeCurrentYearCashFlowMonthlyCumulativeExpenditure(args) + val beforeCurrentYearIncome = dashboardService.BeforeCurrentYearCashFlowMonthlyCumulativeIncome(args) result["incomeList"] = cashFlowMonthlyIncome result["expenditureList"] = cashFlowMonthlyExpenditure result["beforeCurrentYearExpenditure"] = beforeCurrentYearExpenditure + result["beforeCurrentYearIncome"] = beforeCurrentYearIncome return listOf(result) } @GetMapping("/searchCashFlowReceivableAndExpenditure")