#114 Add workflow execution association request

WeBankPartners · Oct 12, 2024 · e6d747b · e6d747b
1 parent 5ba23b3
commit e6d747b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/taskman-server/api/v2/request/request.go b/taskman-server/api/v2/request/request.go
@@ -42,7 +42,7 @@ func CreateRequest(c *gin.Context) {
 		return
 	}
 	param.CreatedBy = middleware.GetRequestUser(c)
-	err := handleCreateRequest(&param, middleware.GetRequestRoles(c), c.GetHeader("Authorization"), c.GetHeader(middleware.AcceptLanguageHeader))
+	_, err := handleCreateRequest(&param, middleware.GetRequestRoles(c), c.GetHeader("Authorization"), c.GetHeader(middleware.AcceptLanguageHeader))
 	if err != nil {
 		middleware.ReturnServerHandleError(c, err)
 		return
@@ -51,7 +51,7 @@ func CreateRequest(c *gin.Context) {
 	middleware.ReturnData(c, param)
 }
 
-func handleCreateRequest(param *models.RequestTable, roles []string, userToken, language string) (err error) {
+func handleCreateRequest(param *models.RequestTable, roles []string, userToken, language string) (newRequest *models.RequestTable, err error) {
 	template, getTemplateErr := service.GetRequestTemplateService().GetRequestTemplate(param.RequestTemplate)
 	if getTemplateErr != nil {
 		err = getTemplateErr
@@ -76,6 +76,7 @@ func handleCreateRequest(param *models.RequestTable, roles []string, userToken,
 	if template.ProcDefId != "" {
 		param.AssociationWorkflow = true
 	}
+	newRequest = param
 	err = service.CreateRequest(param, roles, userToken, language)
 	return
 }
@@ -258,17 +259,23 @@ func PluginCreateRequest(c *gin.Context) {
 }
 
 func handlePluginRequestCreate(input *models.PluginRequestCreateParamObj, callRequestId, token, language string) (result *models.PluginRequestCreateOutputObj, err error) {
+	var newRequest *models.RequestTable
 	result = &models.PluginRequestCreateOutputObj{CallbackParameter: input.CallbackParameter}
 	requestObj := models.RequestTable{RequestTemplate: input.RequestTemplate, Role: input.ReportRole, CreatedBy: input.ReportUser}
 	// 创建请求
-	if err = handleCreateRequest(&requestObj, []string{input.ReportRole}, token, language); err != nil {
+	if newRequest, err = handleCreateRequest(&requestObj, []string{input.ReportRole}, token, language); err != nil {
 		return
 	}
 	if requestObj.Id == "" {
 		err = fmt.Errorf("create request fail,requestId empty")
 		return
 	}
 	result.RequestId = requestObj.Id
+	if newRequest != nil {
+		result.RequestName = newRequest.Name
+		result.RequestTemplate = newRequest.RequestTemplate
+		result.RequestTemplateType = newRequest.Type
+	}
 	// 预览根数据表单
 	previewData, previewErr := service.GetRequestPreData(requestObj.Id, input.RootDataId, token, language)
 	if previewErr != nil {

diff --git a/taskman-server/models/request.go b/taskman-server/models/request.go
@@ -459,11 +459,14 @@ type SimpleRequestDto struct {
 }
 
 type PluginRequestCreateOutputObj struct {
-	CallbackParameter string `json:"callbackParameter"`
-	RequestId         string `json:"requestId"`
-	ErrorCode         string `json:"errorCode"`
-	ErrorMessage      string `json:"errorMessage"`
-	ErrorDetail       string `json:"errorDetail,omitempty"`
+	CallbackParameter   string `json:"callbackParameter"`
+	RequestId           string `json:"requestId"`
+	RequestName         string `json:"requestName"`
+	RequestTemplate     string `json:"requestTemplate"`
+	RequestTemplateType int    `json:"requestTemplateType"`
+	ErrorCode           string `json:"errorCode"`
+	ErrorMessage        string `json:"errorMessage"`
+	ErrorDetail         string `json:"errorDetail,omitempty"`
 }
 
 type TaskProgressNodeSort []*TaskProgressNode