diff --git a/sqle/api/controller/v2/dashboard/workflow_manage.go b/sqle/api/controller/v2/dashboard/workflow_manage.go index 8d1842b8d4..22c9f733eb 100644 --- a/sqle/api/controller/v2/dashboard/workflow_manage.go +++ b/sqle/api/controller/v2/dashboard/workflow_manage.go @@ -22,6 +22,7 @@ type GlobalWorkflowStatisticsV2 struct { ArchivedCount uint64 `json:"archived_count"` // 已完成的工单数量 PendingForMeCount uint64 `json:"pending_for_me_count"` // 待我处理的工单数量 InitiatedByMeCount uint64 `json:"initiated_by_me_count"` // 我发起的工单数量 + ViewAllCount uint64 `json:"view_all_count"` // 查看全部的工单数量 } type GetGlobalWorkflowListReqV2 struct { @@ -36,7 +37,7 @@ type GetGlobalWorkflowListReqV2 struct { FilterInstanceId string `json:"filter_instance_id" query:"filter_instance_id"` // 实例ID // 卡片过滤类型 - FilterCard dashboard_svc.GlobalWorkflowFilterCard `json:"filter_card" query:"filter_card" valid:"omitempty,oneof=archived pending_for_me initiated_by_me" enums:"archived,pending_for_me,initiated_by_me"` + FilterCard dashboard_svc.GlobalWorkflowFilterCard `json:"filter_card" query:"filter_card" valid:"omitempty,oneof=archived pending_for_me initiated_by_me view_all" enums:"archived,pending_for_me,initiated_by_me,view_all"` // 工单类型,sql_release: SQL上线工单,data_export: 数据导出工单 WorkflowType dashboard_svc.WorkflowType `json:"workflow_type" query:"workflow_type" valid:"omitempty,oneof=sql_release data_export" enums:"sql_release,data_export"` @@ -58,7 +59,7 @@ type GlobalWorkflowListData struct { // GetGlobalWorkflowStatisticsV2 // @Summary 获取全局工单管理统计数据 -// @Description get global workflow statistics, returns archived, pending_for_me, and initiated_by_me counts +// @Description get global workflow statistics, returns archived, pending_for_me, initiated_by_me, and view_all counts // @Tags GlobalDashboard // @Id GetGlobalWorkflowStatisticsV2 // @Security ApiKeyAuth @@ -83,7 +84,7 @@ func GetGlobalWorkflowStatisticsV2(c echo.Context) error { // @Param keyword query string false "fuzzy search keyword" // @Param filter_project_uid query string false "filter by project uid" // @Param filter_instance_id query string false "filter by instance id" -// @Param filter_card query string false "filter by card type; archived 已完成工单, pending_for_me 待我处理, initiated_by_me 我发起" Enums(archived,pending_for_me,initiated_by_me) +// @Param filter_card query string false "filter by card type; archived 已完成工单, pending_for_me 待我处理, initiated_by_me 我发起, view_all 查看全部" Enums(archived,pending_for_me,initiated_by_me,view_all) // @Param workflow_type query string false "filter by workflow type; sql_release SQL上线工单, data_export 数据导出工单" Enums(sql_release,data_export) // @Success 200 {object} GlobalWorkflowListResV2 // @Router /v2/dashboard/workflows [get] diff --git a/sqle/docs/docs.go b/sqle/docs/docs.go index bb83f5f224..3a378ef2ad 100644 --- a/sqle/docs/docs.go +++ b/sqle/docs/docs.go @@ -11288,10 +11288,11 @@ var doc = `{ "enum": [ "archived", "pending_for_me", - "initiated_by_me" + "initiated_by_me", + "view_all" ], "type": "string", - "description": "filter by card type; archived 已完成工单, pending_for_me 待我处理, initiated_by_me 我发起", + "description": "filter by card type; archived 已完成工单, pending_for_me 待我处理, initiated_by_me 我发起, view_all 查看全部", "name": "filter_card", "in": "query" }, @@ -11323,7 +11324,7 @@ var doc = `{ "ApiKeyAuth": [] } ], - "description": "get global workflow statistics, returns archived, pending_for_me, and initiated_by_me counts", + "description": "get global workflow statistics, returns archived, pending_for_me, initiated_by_me, and view_all counts", "tags": [ "GlobalDashboard" ], @@ -14048,6 +14049,10 @@ var doc = `{ "pending_for_me_count": { "description": "待我处理的工单数量", "type": "integer" + }, + "view_all_count": { + "description": "查看全部的工单数量", + "type": "integer" } } }, diff --git a/sqle/docs/swagger.json b/sqle/docs/swagger.json index 6c2cc8c932..cd8222cd67 100644 --- a/sqle/docs/swagger.json +++ b/sqle/docs/swagger.json @@ -11272,10 +11272,11 @@ "enum": [ "archived", "pending_for_me", - "initiated_by_me" + "initiated_by_me", + "view_all" ], "type": "string", - "description": "filter by card type; archived 已完成工单, pending_for_me 待我处理, initiated_by_me 我发起", + "description": "filter by card type; archived 已完成工单, pending_for_me 待我处理, initiated_by_me 我发起, view_all 查看全部", "name": "filter_card", "in": "query" }, @@ -11307,7 +11308,7 @@ "ApiKeyAuth": [] } ], - "description": "get global workflow statistics, returns archived, pending_for_me, and initiated_by_me counts", + "description": "get global workflow statistics, returns archived, pending_for_me, initiated_by_me, and view_all counts", "tags": [ "GlobalDashboard" ], @@ -14032,6 +14033,10 @@ "pending_for_me_count": { "description": "待我处理的工单数量", "type": "integer" + }, + "view_all_count": { + "description": "查看全部的工单数量", + "type": "integer" } } }, diff --git a/sqle/docs/swagger.yaml b/sqle/docs/swagger.yaml index 43806cd9fb..482a836f1c 100644 --- a/sqle/docs/swagger.yaml +++ b/sqle/docs/swagger.yaml @@ -269,6 +269,9 @@ definitions: pending_for_me_count: description: 待我处理的工单数量 type: integer + view_all_count: + description: 查看全部的工单数量 + type: integer type: object model.AuditResultInfo: properties: @@ -15380,11 +15383,12 @@ paths: name: filter_instance_id type: string - description: filter by card type; archived 已完成工单, pending_for_me 待我处理, initiated_by_me - 我发起 + 我发起, view_all 查看全部 enum: - archived - pending_for_me - initiated_by_me + - view_all in: query name: filter_card type: string @@ -15408,7 +15412,7 @@ paths: /v2/dashboard/workflows/statistics: get: description: get global workflow statistics, returns archived, pending_for_me, - and initiated_by_me counts + initiated_by_me, and view_all counts operationId: GetGlobalWorkflowStatisticsV2 parameters: - description: filter by project uid diff --git a/sqle/server/dashboard/types.go b/sqle/server/dashboard/types.go index 74dc73e6f0..1435d5ad51 100644 --- a/sqle/server/dashboard/types.go +++ b/sqle/server/dashboard/types.go @@ -37,6 +37,8 @@ const ( GlobalWorkflowFilterCardPendingForMe GlobalWorkflowFilterCard = "pending_for_me" // GlobalWorkflowFilterCardInitiatedByMe: 我发起的 GlobalWorkflowFilterCardInitiatedByMe GlobalWorkflowFilterCard = "initiated_by_me" + // GlobalWorkflowFilterCardViewAll: 查看全部 + GlobalWorkflowFilterCardViewAll GlobalWorkflowFilterCard = "view_all" ) // WorkflowType is the dashboard/API identifier for a workflow business line.