瀏覽代碼

update api remove miscellaneous filter

tags/Baseline_30082024_BACKEND_UAT
Mac\David 1 年之前
父節點
當前提交
a5a5f3053f
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. +3
    -3
      src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt

+ 3
- 3
src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt 查看文件

@@ -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"
)



Loading…
取消
儲存