|
@@ -1812,8 +1812,8 @@ open class ReportService( |
|
|
+ " p.code, " |
|
|
+ " p.code, " |
|
|
+ " p.name, " |
|
|
+ " p.name, " |
|
|
+ " t.code as team, " |
|
|
+ " t.code as team, " |
|
|
+ " c.code as client, " |
|
|
|
|
|
+ " COALESCE(ss.code, 'N/A') as subsidiary, " |
|
|
|
|
|
|
|
|
+ " concat(c.code, ' = ', c.name) as client, " |
|
|
|
|
|
+ " COALESCE(concat(ss.code, ' - ', ss.name), 'N/A') as subsidiary, " |
|
|
+ " p.expectedTotalFee * 0.8 as plannedBudget, " |
|
|
+ " p.expectedTotalFee * 0.8 as plannedBudget, " |
|
|
+ " COALESCE(tns.totalBudget, 0) as actualConsumedBudget, " |
|
|
+ " COALESCE(tns.totalBudget, 0) as actualConsumedBudget, " |
|
|
+ " COALESCE(p.totalManhour, 0) as plannedManhour, " |
|
|
+ " COALESCE(p.totalManhour, 0) as plannedManhour, " |
|
|