Merge pull request #2455 from actiontech/fix-issue2451

Fix issue2451
actiontech · Jun 12, 2024 · 9584ec0 · 9584ec0
2 parents 6db901a + 78c88f2
commit 9584ec0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/sqle/api/controller/v1/workflow.go b/sqle/api/controller/v1/workflow.go
@@ -497,7 +497,7 @@ type GetWorkflowsReqV1 struct {
 	FilterCreateUserId              string `json:"filter_create_user_id" query:"filter_create_user_id"`
 	FilterStatus                    string `json:"filter_status" query:"filter_status" valid:"omitempty,oneof=wait_for_audit wait_for_execution rejected canceled executing exec_failed finished"`
 	FilterCurrentStepAssigneeUserId string `json:"filter_current_step_assignee_user_id" query:"filter_current_step_assignee_user_id"`
-	FilterTaskInstanceName          string `json:"filter_task_instance_name" query:"filter_task_instance_name"`
+	FilterTaskInstanceId            string `json:"filter_task_instance_id" query:"filter_task_instance_id"`
 	FilterTaskExecuteStartTimeFrom  string `json:"filter_task_execute_start_time_from" query:"filter_task_execute_start_time_from"`
 	FilterTaskExecuteStartTimeTo    string `json:"filter_task_execute_start_time_to" query:"filter_task_execute_start_time_to"`
 	PageIndex                       uint32 `json:"page_index" query:"page_index" valid:"required"`
@@ -537,7 +537,7 @@ type WorkflowDetailResV1 struct {
 // @Param filter_create_user_id query string false "filter create user id"
 // @Param filter_status query string false "filter workflow status" Enums(wait_for_audit,wait_for_execution,rejected,executing,canceled,exec_failed,finished)
 // @Param filter_current_step_assignee_user_id query string false "filter current step assignee user id"
-// @Param filter_task_instance_name query string false "filter instance id"
+// @Param filter_task_instance_id query string false "filter instance id"
 // @Param page_index query uint32 true "page index"
 // @Param page_size query uint32 true "size of per page"
 // @Success 200 {object} v1.GetWorkflowsResV1
@@ -564,7 +564,7 @@ func GetGlobalWorkflowsV1(c echo.Context) error {
 		"filter_task_execute_start_time_to":    req.FilterTaskExecuteStartTimeTo,
 		"filter_status":                        req.FilterStatus,
 		"filter_current_step_assignee_user_id": req.FilterCurrentStepAssigneeUserId,
-		"filter_task_instance_name":            req.FilterTaskInstanceName,
+		"filter_task_instance_id":              req.FilterTaskInstanceId,
 		"current_user_id":                      user.GetIDStr(),
 		"check_user_can_access":                user.Name != model.DefaultAdminUser, // dms-todo: 判断是否是超级管理员
 		"limit":                                limit,
@@ -621,7 +621,7 @@ func GetGlobalWorkflowsV1(c echo.Context) error {
 // @Param filter_create_user_id query string false "filter create user id"
 // @Param filter_status query string false "filter workflow status" Enums(wait_for_audit,wait_for_execution,rejected,executing,canceled,exec_failed,finished)
 // @Param filter_current_step_assignee_user_id query string false "filter current step assignee user id"
-// @Param filter_task_instance_name query string false "filter instance name"
+// @Param filter_task_instance_id query string false "filter instance id"
 // @Param page_index query uint32 true "page index"
 // @Param page_size query uint32 true "size of per page"
 // @Param project_name path string true "project name"
@@ -659,7 +659,7 @@ func GetWorkflowsV1(c echo.Context) error {
 		"filter_task_execute_start_time_to":    req.FilterTaskExecuteStartTimeTo,
 		"filter_status":                        req.FilterStatus,
 		"filter_current_step_assignee_user_id": req.FilterCurrentStepAssigneeUserId,
-		"filter_task_instance_name":            req.FilterTaskInstanceName,
+		"filter_task_instance_id":              req.FilterTaskInstanceId,
 		"filter_project_id":                    projectUid,
 		"current_user_id":                      user.ID,
 		"check_user_can_access":                !up.IsAdmin(),
@@ -818,7 +818,7 @@ type ExportWorkflowReqV1 struct {
 	FilterCreateUserID              string `json:"filter_create_user_id" query:"filter_create_user_id"`
 	FilterStatus                    string `json:"filter_status" query:"filter_status" valid:"omitempty,oneof=wait_for_audit wait_for_execution rejected canceled executing exec_failed finished"`
 	FilterCurrentStepAssigneeUserId string `json:"filter_current_step_assignee_user_id" query:"filter_current_step_assignee_user_id"`
-	FilterTaskInstanceName          string `json:"filter_task_instance_name" query:"filter_task_instance_name"`
+	FilterTaskInstanceId            string `json:"filter_task_instance_id" query:"filter_task_instance_id"`
 	FilterTaskExecuteStartTimeFrom  string `json:"filter_task_execute_start_time_from" query:"filter_task_execute_start_time_from"`
 	FilterTaskExecuteStartTimeTo    string `json:"filter_task_execute_start_time_to" query:"filter_task_execute_start_time_to"`
 	FuzzyKeyword                    string `json:"fuzzy_keyword" query:"fuzzy_keyword"`
@@ -839,7 +839,7 @@ type ExportWorkflowReqV1 struct {
 // @Param filter_create_user_id query string false "filter create user id"
 // @Param filter_status query string false "filter workflow status" Enums(wait_for_audit,wait_for_execution,rejected,executing,canceled,exec_failed,finished)
 // @Param filter_current_step_assignee_user_id query string false "filter current step assignee user id"
-// @Param filter_task_instance_name query string false "filter instance name"
+// @Param filter_task_instance_id query string false "filter instance id"
 // @Param project_name path string true "project name"
 // @Param fuzzy_keyword query string false "fuzzy matching subject/workflow_id/desc"
 // @Success 200 {file} file "export workflow"

diff --git a/sqle/docs/docs.go b/sqle/docs/docs.go
@@ -4560,8 +4560,8 @@ var doc = `{
                     },
                     {
                         "type": "string",
-                        "description": "filter instance name",
-                        "name": "filter_task_instance_name",
+                        "description": "filter instance id",
+                        "name": "filter_task_instance_id",
                         "in": "query"
                     },
                     {
@@ -4811,8 +4811,8 @@ var doc = `{
                     },
                     {
                         "type": "string",
-                        "description": "filter instance name",
-                        "name": "filter_task_instance_name",
+                        "description": "filter instance id",
+                        "name": "filter_task_instance_id",
                         "in": "query"
                     },
                     {
@@ -7012,7 +7012,7 @@ var doc = `{
                     {
                         "type": "string",
                         "description": "filter instance id",
-                        "name": "filter_task_instance_name",
+                        "name": "filter_task_instance_id",
                         "in": "query"
                     },
                     {

diff --git a/sqle/docs/swagger.json b/sqle/docs/swagger.json
@@ -4544,8 +4544,8 @@
                     },
                     {
                         "type": "string",
-                        "description": "filter instance name",
-                        "name": "filter_task_instance_name",
+                        "description": "filter instance id",
+                        "name": "filter_task_instance_id",
                         "in": "query"
                     },
                     {
@@ -4795,8 +4795,8 @@
                     },
                     {
                         "type": "string",
-                        "description": "filter instance name",
-                        "name": "filter_task_instance_name",
+                        "description": "filter instance id",
+                        "name": "filter_task_instance_id",
                         "in": "query"
                     },
                     {
@@ -6996,7 +6996,7 @@
                     {
                         "type": "string",
                         "description": "filter instance id",
-                        "name": "filter_task_instance_name",
+                        "name": "filter_task_instance_id",
                         "in": "query"
                     },
                     {

diff --git a/sqle/docs/swagger.yaml b/sqle/docs/swagger.yaml
@@ -7246,9 +7246,9 @@ paths:
         in: query
         name: filter_current_step_assignee_user_id
         type: string
-      - description: filter instance name
+      - description: filter instance id
         in: query
-        name: filter_task_instance_name
+        name: filter_task_instance_id
         type: string
       - description: page index
         in: query
@@ -7787,9 +7787,9 @@ paths:
         in: query
         name: filter_current_step_assignee_user_id
         type: string
-      - description: filter instance name
+      - description: filter instance id
         in: query
-        name: filter_task_instance_name
+        name: filter_task_instance_id
         type: string
       - description: project name
         in: path
@@ -8839,7 +8839,7 @@ paths:
         type: string
       - description: filter instance id
         in: query
-        name: filter_task_instance_name
+        name: filter_task_instance_id
         type: string
       - description: page index
         in: query

diff --git a/sqle/model/workflow_list.go b/sqle/model/workflow_list.go
@@ -127,8 +127,8 @@ OR IF(wr.status = 'wait_for_execution'
 AND tasks.status = :filter_task_status
 {{- end }}
 
-{{- if .filter_task_instance_name }}
-AND inst.name = :filter_task_instance_name
+{{- if .filter_task_instance_id }}
+AND tasks.instance_id = :filter_task_instance_id
 {{- end }}
 
 {{- if .filter_workflow_id }}