huahaiyan 6 éve
szülő
commit
01bada1b0a

+ 4 - 1
src/dashoo.cn/backend/api/conf/app.conf

@@ -69,4 +69,7 @@ name=casbin
 host=47.92.212.59
 user=root
 pwd=zks123456
-domain=oil_supplier
+domain=oil_supplier
+
+[workflow]
+callbackHost=http://192.168.0.194:10091

+ 5 - 2
src/dashoo.cn/backend/api/controllers/oilsupplier/annualaudit.go

@@ -436,8 +436,9 @@ func (this *AnnualAuditController) BasicList() {
 // @Success	200	{object} controllers.Request
 // @router /auditcallback [get]
 func (this *AnnualAuditController) AuditCallback() {
-	result := this.GetString("result")
-	fmt.Println(result)
+	result := this.GetString("Result")
+	status := this.GetString("Status")
+	fmt.Println(result,status)
 }
 
 // @Title 审核
@@ -510,6 +511,7 @@ func (this *AnnualAuditController) QianfaReport() {
 		ActiComplete.UserId = this.User.Id
 		ActiComplete.Result = "1"
 		ActiComplete.Remarks = "业务处室审核通过"
+		ActiComplete.CallbackUrl =  utils.Cfg.MustValue("workflow", "callbackHost")+"/api/annualaudit/auditcallback?status="+utils.ToStr(entityempty.Status)
 		res := svcActiviti.TaskComplete(ActiComplete)
 		if res == "true" {
 			errinfo.Message = "审核通过!"
@@ -538,6 +540,7 @@ func (this *AnnualAuditController) QianfaReport() {
 		ActiComplete.UserId = this.User.Id
 		ActiComplete.Result = "0"
 		ActiComplete.Remarks = "业务处室审核未通过"
+		ActiComplete.CallbackUrl =  utils.Cfg.MustValue("workflow", "callbackHost")+"/api/annualaudit/auditcallback?status="+utils.ToStr(entityempty.Status)
 		res := svcActiviti.TaskComplete(ActiComplete)
 		if res == "true" {
 			errinfo.Message = "审核未通过!"