|
|
@@ -105,7 +105,7 @@ open class DashboardService( |
|
|
|
+ " ) milestonePayment on milestonePayment.pid = p.id" |
|
|
|
+ " where p.customerId = :customerId" |
|
|
|
+ " and p.customerSubsidiaryId = :subsidiaryId" |
|
|
|
+ " and (tg.name != '5. Miscellaneous' or tg.name is null)" |
|
|
|
// + " and (tg.name != '5. Miscellaneous' or tg.name is null)" |
|
|
|
+ " and p.status not in (\"Pending to Start\",\"Completed\",\"Deleted\")" |
|
|
|
) |
|
|
|
|
|
|
@@ -159,7 +159,7 @@ open class DashboardService( |
|
|
|
+ " where p.customerId = :customerId" |
|
|
|
+ " and isNull(p.customerSubsidiaryId)" |
|
|
|
+ " and p.status not in (\"Pending to Start\",\"Completed\",\"Deleted\")" |
|
|
|
+ " and (tg.name != '5. Miscellaneous' or tg.name is null)" |
|
|
|
// + " and (tg.name != '5. Miscellaneous' or tg.name is null)" |
|
|
|
+ " group by p.id, p.code, p.name, te.code, s.name, p.totalManhour, milestonePayment.comingPaymentMilestone" |
|
|
|
) |
|
|
|
|
|
|
@@ -312,7 +312,7 @@ open class DashboardService( |
|
|
|
+ " ) milestonePayment on milestonePayment.pid = p.id" |
|
|
|
+ " where p.teamLead = :teamLeadId" |
|
|
|
+ " and p.status not in (\"Pending to Start\",\"Completed\",\"Deleted\")" |
|
|
|
+ " and (tg.name != '5. Miscellaneous' or tg.name is null)" |
|
|
|
// + " and (tg.name != '5. Miscellaneous' or tg.name is null)" |
|
|
|
+ " group by p.id, p.code, p.name, te.code, s.name, p.totalManhour, milestonePayment.comingPaymentMilestone" |
|
|
|
) |
|
|
|
|
|
|
|