浏览代码

update project status by team query issue

add_swagger
MSI\2Fi 8 个月前
父节点
当前提交
e54a8cf6c6
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. +4
    -2
      src/main/java/com/ffii/tsms/modules/data/service/DashboardService.kt

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

@@ -391,6 +391,7 @@ open class DashboardService(
+ " left join project p on s.id = p.teamLead" + " left join project p on s.id = p.teamLead"
+ " where t.deleted = 0" + " where t.deleted = 0"
+ " and p.status not in (\"Pending to Start\",\"Completed\",\"Deleted\")" + " and p.status not in (\"Pending to Start\",\"Completed\",\"Deleted\")"
+ " and p.deleted = false "
) )


if (viewDashboardAuthority() == "self") { if (viewDashboardAuthority() == "self") {
@@ -476,11 +477,12 @@ open class DashboardService(
+ " ) AS subquery" + " ) AS subquery"
+ " GROUP BY pid" + " GROUP BY pid"
+ " ORDER BY comingPaymentMilestone ASC" + " ORDER BY comingPaymentMilestone ASC"
+ " ) milestonePayment on milestonePayment.pid = p.id"
+ " ) milestonePayment on milestonePayment.pid = p.id "
+ " WHERE p.deleted = false "


) )
if (args["teamLeadId"] != null && args["teamLeadId"].toString().toInt() > 0) { if (args["teamLeadId"] != null && args["teamLeadId"].toString().toInt() > 0) {
sql.append(" WHERE p.teamLead = :teamLeadId")
sql.append(" and p.teamLead = :teamLeadId")
} }
sql.append(" and p.status not in (\"Pending to Start\",\"Completed\",\"Deleted\")" sql.append(" 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)"


正在加载...
取消
保存