年审审核修改

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

@@ -35,7 +35,7 @@ func (s *OilAnnualAuditService) GetSupplierList(supname, auditname string) []Sup
 }
 
 //通用多部门多实例审核方法
-func (s *OilAnnualAuditService) SubmitOrgAudit(Status, workflowid, certId, annualId, wfName, wfNodeCode, userId, result, remarks, OilSupplierCertSubName, OilClassOrgSettingName string) (processInstanceId, res string) {
+func (s *OilAnnualAuditService) SubmitOrgAudit(status, workflowid, certId, annualId, wfName, wfNodeCode, userId, result, remarks, OilSupplierCertSubName, OilClassOrgSettingName string) (processInstanceId, res string) {
 	//取出审批列表
 	var supplierCert suppliercert.OilSupplierCert
 	s.GetEntityById(certId, &supplierCert)
@@ -115,7 +115,7 @@ func (s *OilAnnualAuditService) SubmitOrgAudit(Status, workflowid, certId, annua
 	ActiComplete.UserId = userId
 	ActiComplete.Result = result
 	ActiComplete.Remarks = remarks
-	ActiComplete.CallbackUrl =  utils.Cfg.MustValue("workflow", "callbackHost")+"/api/annualaudit/auditcallback?Status="+Status
+	ActiComplete.CallbackUrl =  utils.Cfg.MustValue("workflow", "callbackHost")+"/api/annualaudit/auditcallback?status="+ status +"&annualId="+ annualId
 	res = svcActiviti.MultiTaskComplete(ActiComplete)
 	return processInstanceId, res
 }

src/dashoo.cn/backend/api/controllers/oilsupplier/annualaudit.go

@@ -436,9 +436,24 @@ func (this *AnnualAuditController) BasicList() {
 // @Success	200	{object} controllers.Request
 // @router /auditcallback [get]
 func (this *AnnualAuditController) AuditCallback() {
-	result := this.GetString("Result")
-	status := this.GetString("Status")
-	fmt.Println(result,status)
+	result := this.GetString("ret")
+	bussinsid := this.GetString("busid")
+	status := this.GetString("status")
+	annualId := this.GetString("annualId")
+	svc := annualaudit.GetOilAnnualAuditService(utils.DBE)
+	var entityempty annualaudit.OilAnnualAudit
+	var err error
+	var errinfo ErrorInfo
+	var cols []string = []string{"Status"}
+	entityempty.Status, _ = strconv.Atoi(status)
+	err = svc.UpdateEntityBytbl(OilAnnualAuditName,annualId,&entityempty,cols)
+	if err != nil {
+		errinfo.Message = "审核错误！"
+		errinfo.Code = -1
+		this.Data["json"] = &errinfo
+		this.ServeJSON()
+	}
+	fmt.Println(result,status,annualId,bussinsid)
 }
 
 // @Title 审核
@@ -455,11 +470,7 @@ func (this *AnnualAuditController) QianfaReport() {
 	svc.GetEntityByWhere(""+OilAnnualAuditName, where, &list)
 	//审核状态判断进行的操作
 	if dataother.SuccessStatus == 1 {
-		var entityempty annualaudit.OilAnnualAudit
 		var errinfo ErrorInfo
-		//var cols []string = []string{"Status", "Remark"}
-		entityempty.Status = dataother.SuccessStatus
-		entityempty.Remark = dataother.AuditorRemark
 		//提交审核工作流
 		processInstanceId, res := svc.SubmitOrgAudit(utils.ToStr(dataother.SuccessStatus), list.WorkflowId, utils.ToStr(list.CerId), utils.ToStr(list.Id), workflow.OIL_AUDIT_APPLY, workflow.PROF_AUDIT, this.User.Id, "1", "提交给业务处室专业审核", OilSupplierCertSubName, OilClassOrgSettingName)
 		fmt.Println(processInstanceId)
@@ -476,11 +487,7 @@ func (this *AnnualAuditController) QianfaReport() {
 		}
 
 	} else if dataother.SuccessStatus == 2 {
-		var entityempty annualaudit.OilAnnualAudit
 		var errinfo ErrorInfo
-		//var cols []string = []string{"Status", "Remark"}
-		entityempty.Status = dataother.SuccessStatus
-		entityempty.Remark = dataother.AuditorRemark
 		//提交审核工作流
 		processInstanceId, res := svc.SubmitOrgAudit(utils.ToStr(dataother.SuccessStatus), list.WorkflowId, utils.ToStr(list.CerId), utils.ToStr(list.Id), workflow.OIL_AUDIT_APPLY, workflow.PROF_AUDIT, this.User.Id, "0", "提交给业务处室专业审核", OilSupplierCertSubName, OilClassOrgSettingName)
 		fmt.Println(processInstanceId)
@@ -496,11 +503,7 @@ func (this *AnnualAuditController) QianfaReport() {
 			this.ServeJSON()
 		}
 	} else if dataother.SuccessStatus == 3 {
-		var entityempty annualaudit.OilAnnualAudit
 		var errinfo ErrorInfo
-		//var cols []string = []string{"Status", "Remark"}
-		entityempty.Status = dataother.SuccessStatus
-		entityempty.Remark = dataother.AuditorRemark
 		//多实例工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		//多实例提交给下一步
@@ -511,7 +514,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)
+		ActiComplete.CallbackUrl =  utils.Cfg.MustValue("workflow", "callbackHost")+"/api/annualaudit/auditcallback?status="+utils.ToStr(dataother.SuccessStatus) +"&annualId="+ utils.ToStr(dataother.AnnualId)
 		res := svcActiviti.TaskComplete(ActiComplete)
 		if res == "true" {
 			errinfo.Message = "审核通过！"
@@ -525,11 +528,7 @@ func (this *AnnualAuditController) QianfaReport() {
 			this.ServeJSON()
 		}
 	} else if dataother.SuccessStatus == 4 {
-		var entityempty annualaudit.OilAnnualAudit
 		var errinfo ErrorInfo
-		//var cols []string = []string{"Status", "Remark"}
-		entityempty.Status = dataother.SuccessStatus
-		entityempty.Remark = dataother.AuditorRemark
 		//多实例工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		//多实例提交给下一步
@@ -540,7 +539,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)
+		ActiComplete.CallbackUrl =  utils.Cfg.MustValue("workflow", "callbackHost")+"/api/annualaudit/auditcallback?status="+utils.ToStr(dataother.SuccessStatus) +"&annualId="+ utils.ToStr(dataother.AnnualId)
 		res := svcActiviti.TaskComplete(ActiComplete)
 		if res == "true" {
 			errinfo.Message = "审核未通过！"