MSI\derek
1 year ago
1 changed files with 6 additions and 3 deletions
Unified View
Diff Options
+ 6
- 3
src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt
View File
| @@ -1687,7 +1687,8 @@ open class DashboardService( | |||||
| + " coalesce (sum(i.issueAmount) - sum(i.paidAmount),0) as receivable," | + " coalesce (sum(i.issueAmount) - sum(i.paidAmount),0) as receivable," | ||||
| + " coalesce (round((sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8,2),0) as totalBudget," | + " coalesce (round((sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8,2),0) as totalBudget," | ||||
| + " coalesce (expenditure.expenditure + sum(pc.expense), 0) as totalExpenditure," | + " coalesce (expenditure.expenditure + sum(pc.expense), 0) as totalExpenditure," | ||||
| + " coalesce ((sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8 - expenditure.expenditure,0) as expenditureReceivable," | |||||
| + " (sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8 - coalesce(sum(pc.expense), 0) as expenditureReceivable," | |||||
| // + " coalesce ((sum(p.expectedTotalFee) - sum(ifnull(p.subContractFee, 0)))*0.8 - expenditure.expenditure,0) as expenditureReceivable," | |||||
| + " sum(p.expectedTotalFee) as totalProjectFee," | + " sum(p.expectedTotalFee) as totalProjectFee," | ||||
| + " coalesce (round(sum(i.issueAmount)/sum(p.expectedTotalFee)*100,0),0) as invoicedPercentage" | + " coalesce (round(sum(i.issueAmount)/sum(p.expectedTotalFee)*100,0),0) as invoicedPercentage" | ||||
| + " from project p" | + " from project p" | ||||
| @@ -1888,8 +1889,10 @@ open class DashboardService( | |||||
| + " END AS remarks " | + " END AS remarks " | ||||
| + " FROM ( " | + " FROM ( " | ||||
| + " SELECT " | + " SELECT " | ||||
| + " DATE_FORMAT(pe.receiptDate, '%Y-%m') AS parsed_date, " | |||||
| + " DATE_FORMAT(pe.receiptDate, '%m/%y') AS formatted_date, " | |||||
| // + " DATE_FORMAT(pe.receiptDate, '%Y-%m') AS parsed_date, " | |||||
| // + " DATE_FORMAT(pe.receiptDate, '%m/%y') AS formatted_date, " | |||||
| + " DATE_FORMAT(pe.issueDate, '%m/%y') AS parsed_date, " | |||||
| + " DATE_FORMAT(pe.issueDate, '%m/%y') AS formatted_date, " | |||||
| + " NULL AS income, " | + " NULL AS income, " | ||||
| + " NULL AS expenditure, " | + " NULL AS expenditure, " | ||||
| + " SUM(pe.amount) AS expense, " | + " SUM(pe.amount) AS expense, " | ||||