|
|
@@ -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 = "审核未通过!"
|