workflow callbackurl

src/dashoo.cn/backend/api/business/oilsupplier/annualaudit/annualauditService.go

@@ -107,6 +107,15 @@ func (s *OilAnnualAuditService) SubmitOrgAudit(workflowid, certId, annualId, wfN
 		processInstanceId = svcActiviti.StartProcess(wfName, annualId, userId)
 	}
 	//多实例提交给下一步
-	res = svcActiviti.MultiTaskComplete(wfName, annualId, "", orgAudits, userId, result, remarks)
+	var ActiComplete workflow.MultiActiCompleteVM
+	ActiComplete.ProcessKey = wfName
+	ActiComplete.BusinessKey = annualId
+	ActiComplete.UserNames = ""
+	ActiComplete.MultiOrgAudits = orgAudits
+	ActiComplete.UserId = userId
+	ActiComplete.Result = result
+	ActiComplete.Remarks = remarks
+	ActiComplete.CallbackUrl = ""
+	res = svcActiviti.MultiTaskComplete(ActiComplete)
 	return processInstanceId, res
 }

src/dashoo.cn/backend/api/business/oilsupplier/infochange/infochangeService.go

@@ -106,6 +106,15 @@ func (s *InfoChangeService) SubmitOrgAudit(workflowid, certId, annualId, wfName,
 		processInstanceId = svcActiviti.StartProcess(wfName, annualId, userId)
 	}
 	//多实例提交给下一步
-	svcActiviti.MultiTaskComplete(wfName, annualId, "", orgAudits, userId, result, remarks)
+	var ActiComplete workflow.MultiActiCompleteVM
+	ActiComplete.ProcessKey = wfName
+	ActiComplete.BusinessKey = annualId
+	ActiComplete.UserNames = ""
+	ActiComplete.MultiOrgAudits = orgAudits
+	ActiComplete.UserId = userId
+	ActiComplete.Result = result
+	ActiComplete.Remarks = remarks
+	ActiComplete.CallbackUrl = ""
+	svcActiviti.MultiTaskComplete(ActiComplete)
 	return processInstanceId
 }

src/dashoo.cn/backend/api/business/oilsupplier/qualchange/qualchangeService.go

@@ -134,6 +134,15 @@ func (s *QualChangeService) SubmitOrgAudit(workflowid, certId, annualId, wfName,
 		processInstanceId = svcActiviti.StartProcess(wfName, annualId, userId)
 	}
 	//多实例提交给下一步
-	svcActiviti.MultiTaskComplete(wfName, annualId, "", orgAudits, userId, result, remarks)
+	var ActiComplete workflow.MultiActiCompleteVM
+	ActiComplete.ProcessKey = wfName
+	ActiComplete.BusinessKey = annualId
+	ActiComplete.UserNames = ""
+	ActiComplete.MultiOrgAudits = orgAudits
+	ActiComplete.UserId = userId
+	ActiComplete.Result = result
+	ActiComplete.Remarks = remarks
+	ActiComplete.CallbackUrl = ""
+	svcActiviti.MultiTaskComplete(ActiComplete)
 	return processInstanceId
 }

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercertService.go

@@ -96,7 +96,16 @@ func (s *OilSupplierCertService) SubmitOrgAudit(certId, wfName, wfNodeCode, user
 		processInstanceId = svcActiviti.StartProcess(wfName, certId, userId)
 	}
 	//多实例提交给下一步
-	svcActiviti.MultiTaskComplete(wfName, certId, "", orgAudits, userId, result, remarks)
+	var ActiComplete workflow.MultiActiCompleteVM
+	ActiComplete.ProcessKey = wfName
+	ActiComplete.BusinessKey = certId
+	ActiComplete.UserNames = ""
+	ActiComplete.MultiOrgAudits = orgAudits
+	ActiComplete.UserId = userId
+	ActiComplete.Result = result
+	ActiComplete.Remarks = remarks
+	ActiComplete.CallbackUrl = ""
+	svcActiviti.MultiTaskComplete(ActiComplete)
 	return processInstanceId
 }
 

src/dashoo.cn/backend/api/business/oilsupplier/suppliercertappend/oilsuppliercertappendService.go

@@ -99,6 +99,15 @@ func (s *OilSupplierCertAppendService) SubmitOrgAudit(certId, wfName, wfNodeCode
 		processInstanceId = svcActiviti.StartProcess(wfName, certId, userId)
 	}
 	//多实例提交给下一步
-	svcActiviti.MultiTaskComplete(wfName, certId, "", orgAudits, userId, result, remarks)
+	var ActiComplete workflow.MultiActiCompleteVM
+	ActiComplete.ProcessKey = wfName
+	ActiComplete.BusinessKey = certId
+	ActiComplete.UserNames = ""
+	ActiComplete.MultiOrgAudits = orgAudits
+	ActiComplete.UserId = userId
+	ActiComplete.Result = result
+	ActiComplete.Remarks = remarks
+	ActiComplete.CallbackUrl = ""
+	svcActiviti.MultiTaskComplete(ActiComplete)
 	return processInstanceId
 }

src/dashoo.cn/backend/api/business/workflow/ActivitiService.go

@@ -117,15 +117,17 @@ func (this *ActivitiService) StartProcess(processKey string, formEntityId string
 	return string(p)
 }
 
-func (this *ActivitiService) TaskComplete(processKey string, formEntityId string, userNames string, userId string, result string, remarks string) string {
-
-	var ActiComplete ActiCompleteVM
+//func (this *ActivitiService) TaskComplete(processKey string, formEntityId string, userNames string, userId string, result string, remarks string) string {
+	/*var ActiComplete ActiCompleteVM
 	ActiComplete.ProcessKey = processKey
 	ActiComplete.BusinessKey = formEntityId
 	ActiComplete.UserNames = userNames
 	ActiComplete.UserId = userId
 	ActiComplete.Result = result
-	ActiComplete.Remarks = remarks
+	ActiComplete.Remarks = remarks*/
+
+func (this *ActivitiService) TaskComplete(ActiComplete ActiCompleteVM) string {
+
 	jsonParams, err := json.Marshal(ActiComplete)
 	if err != nil {
 		fmt.Println(err, "生成json字符串错误")
@@ -138,7 +140,7 @@ func (this *ActivitiService) TaskComplete(processKey string, formEntityId string
 	return string(p)
 }
 
-func (this *ActivitiService) MultiTaskComplete(processKey string, formEntityId string, userNames string, multiOrgAudits []MultiOrgAuditVM, userId string, result string, remarks string) string {
+/*func (this *ActivitiService) MultiTaskComplete(processKey string, formEntityId string, userNames string, multiOrgAudits []MultiOrgAuditVM, userId string, result string, remarks string, callbackUrl string) string {
 
 	var ActiComplete MultiActiCompleteVM
 	ActiComplete.ProcessKey = processKey
@@ -148,6 +150,10 @@ func (this *ActivitiService) MultiTaskComplete(processKey string, formEntityId s
 	ActiComplete.UserId = userId
 	ActiComplete.Result = result
 	ActiComplete.Remarks = remarks
+	ActiComplete.CallbackUrl = callbackUrl*/
+
+func (this *ActivitiService) MultiTaskComplete(ActiComplete MultiActiCompleteVM) string {
+
 	jsonParams, err := json.Marshal(ActiComplete)
 	if err != nil {
 		fmt.Println(err, "生成json字符串错误")

src/dashoo.cn/backend/api/business/workflow/workflow.go

@@ -16,6 +16,7 @@ type ActiCompleteVM struct {
 	UserId      string `json:"userId"`
 	Result      string `json:"result"`
 	Remarks     string `json:"remarks"`
+	CallbackUrl string `json:"callbackUrl"`
 }
 
 type ActiMyTasksVM struct {
@@ -54,6 +55,7 @@ type MultiActiCompleteVM struct {
 	Result         string            `json:"result"`
 	Remarks        string            `json:"remarks"`
 	MultiOrgAudits []MultiOrgAuditVM `json:"multiOrgAudits"`
+	CallbackUrl    string            `json:"callbackUrl"`
 }
 
 type MultiOrgAuditVM struct {