工作流问题

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(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(workflowid, certId, annualId, wfN
 	ActiComplete.UserId = userId
 	ActiComplete.Result = result
 	ActiComplete.Remarks = remarks
-	ActiComplete.CallbackUrl = ""
+	ActiComplete.CallbackUrl =  utils.Cfg.MustValue("workflow", "callbackHost")+"/api/annualaudit/auditcallback?Status="+Status
 	res = svcActiviti.MultiTaskComplete(ActiComplete)
 	return processInstanceId, res
 }

src/dashoo.cn/backend/api/controllers/base.go

@@ -272,7 +272,7 @@ func (this *BaseController) Prepare() {
 		"/api/webinterface/preparelist", "/api/webinterface/prepareinfo",
 		"/api/sampletest_v/sampletest", "/api/sampletest_v/getpass", "/api/sampletest_v/editpass/",
 		"/api/sampletest_v/donorsdetail", "/api/sampletest_v/testdetail", "/api/uploads/samplesinput", "/api/doctemplate_onlyoffice/callback", "/api/doctemplate_onlyoffice/viewcallback", "/api/limsupload/usersignimg",
-		"/api/uploads/samplestypeimg", "/api/workflow/historyimg/", "/api/document/getdocumentnameandtime"}
+		"/api/uploads/samplestypeimg", "/api/workflow/historyimg/", "/api/document/getdocumentnameandtime", "/api/annualaudit/auditcallback"}
 	for _, v := range urls {
 		fmt.Println("**this.Ctx.Input.URL()**", this.Ctx.Input.URL())
 		if this.Ctx.Input.URL() == v {

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

@@ -148,7 +148,7 @@ func (this *AnnualAuditController) GetMyTaskEntityList() {
 	where += " and Id in (" + certIdList + ")"
 	//根据部门查询待办任务
 
-	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size,orderby,asc, &list, where)
+	total := svc.GetPagingEntitiesWithOrderBytbl("", page.CurrentPage, page.Size, orderby, asc, &list, where)
 	//total := svc.GetMyPagingEntitiesWithOrderBytbl(OilSupplierName, OilSupplierCertName, page.CurrentPage, page.Size, orderby, asc, &list, where)
 
 	var datainfo DataInfo
@@ -160,8 +160,6 @@ func (this *AnnualAuditController) GetMyTaskEntityList() {
 	this.ServeJSON()
 }
 
-
-
 // @Title 获取年审企业名称
 // @Description 获取实体
 // @Success 200 {object} annualaudit.OilAnnualAudit
@@ -260,7 +258,7 @@ func (this *AnnualAuditController) AddEntity() {
 	_, err := svc.InsertEntityBytbl(""+OilAnnualAuditName, &model)
 	annualId := model.Id
 	//工作流开始
-	processInstanceId, res := svc.SubmitOrgAudit(model.WorkflowId, utils.ToStr(model.CerId), utils.ToStr(model.Id), workflow.OIL_AUDIT_APPLY, workflow.FIRST_TRIAL, this.User.Id, "1", "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
+	processInstanceId, res := svc.SubmitOrgAudit("", model.WorkflowId, utils.ToStr(model.CerId), utils.ToStr(model.Id), workflow.OIL_AUDIT_APPLY, workflow.FIRST_TRIAL, this.User.Id, "1", "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
 	var auditmodel annualaudit.OilAnnualAudit
 	auditmodel.WorkflowId = processInstanceId
 	cols := []string{
@@ -268,7 +266,7 @@ func (this *AnnualAuditController) AddEntity() {
 		"WorkflowId",
 	}
 	if res == "true" {
-		_,err = svc.UpdateEntityByIdCols(annualId, auditmodel, cols)
+		_, err = svc.UpdateEntityByIdCols(annualId, auditmodel, cols)
 		if err == nil {
 			//新增
 			errinfo.Message = "添加成功！"
@@ -282,7 +280,7 @@ func (this *AnnualAuditController) AddEntity() {
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 		}
-	}else {
+	} else {
 		errinfo.Message = "工作流异常，请联系管理员！"
 		errinfo.Code = -1
 		this.Data["json"] = &errinfo
@@ -433,6 +431,15 @@ func (this *AnnualAuditController) BasicList() {
 	this.ServeJSON()
 }
 
+// @Title 审核
+// @Description 审核
+// @Success	200	{object} controllers.Request
+// @router /auditcallback [get]
+func (this *AnnualAuditController) AuditCallback() {
+	result := this.GetString("result")
+	fmt.Println(result)
+}
+
 // @Title 审核
 // @Description 审核
 // @Success	200	{object} controllers.Request
@@ -449,117 +456,99 @@ func (this *AnnualAuditController) QianfaReport() {
 	if dataother.SuccessStatus == 1 {
 		var entityempty annualaudit.OilAnnualAudit
 		var errinfo ErrorInfo
-		var cols []string = []string{"Status", "Remark"}
+		//var cols []string = []string{"Status", "Remark"}
 		entityempty.Status = dataother.SuccessStatus
 		entityempty.Remark = dataother.AuditorRemark
 		//提交审核工作流
-		processInstanceId, res := svc.SubmitOrgAudit(list.WorkflowId, utils.ToStr(list.CerId), utils.ToStr(list.Id), workflow.OIL_AUDIT_APPLY, workflow.PROF_AUDIT, this.User.Id, "1", "提交给业务处室专业审核", OilSupplierCertSubName, OilClassOrgSettingName)
+		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)
 		if res == "true" {
-			err := svc.UpdateEntityBytbl(""+OilAnnualAuditName, list.Id, entityempty, cols)
-			if err == nil {
-				errinfo.Message = "审核通过！"
-				errinfo.Code = 0
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-			} else {
-				errinfo.Message = "审核错误！"
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-			}
-		}else{
+			errinfo.Message = "审核通过！"
+			errinfo.Code = 0
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
 			errinfo.Message = "工作流异常，请联系管理员！"
 			errinfo.Code = -1
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 		}
 
-	} else if dataother.SuccessStatus == 2{
+	} else if dataother.SuccessStatus == 2 {
 		var entityempty annualaudit.OilAnnualAudit
 		var errinfo ErrorInfo
-		var cols []string = []string{"Status", "Remark"}
+		//var cols []string = []string{"Status", "Remark"}
 		entityempty.Status = dataother.SuccessStatus
 		entityempty.Remark = dataother.AuditorRemark
 		//提交审核工作流
-		processInstanceId,res := svc.SubmitOrgAudit(list.WorkflowId, utils.ToStr(list.CerId), utils.ToStr(list.Id), workflow.OIL_AUDIT_APPLY, workflow.PROF_AUDIT, this.User.Id, "0", "提交给业务处室专业审核", OilSupplierCertSubName, OilClassOrgSettingName)
+		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)
 		if res == "true" {
-			err := svc.UpdateEntityBytbl(""+OilAnnualAuditName, list.Id, entityempty, cols)
-			if err == nil {
-				errinfo.Message = "审核未通过！"
-				errinfo.Code = 0
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-			} else {
-				errinfo.Message = "审核错误！"
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-			}
-		}else {
+			errinfo.Message = "审核未通过！"
+			errinfo.Code = 0
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
 			errinfo.Message = "工作流异常，请联系管理员！"
 			errinfo.Code = -1
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 		}
-	}else if dataother.SuccessStatus == 3 {
+	} else if dataother.SuccessStatus == 3 {
 		var entityempty annualaudit.OilAnnualAudit
 		var errinfo ErrorInfo
-		var cols []string = []string{"Status", "Remark"}
+		//var cols []string = []string{"Status", "Remark"}
 		entityempty.Status = dataother.SuccessStatus
 		entityempty.Remark = dataother.AuditorRemark
 		//多实例工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		//多实例提交给下一步
-		res := svcActiviti.TaskComplete(workflow.OIL_AUDIT_APPLY, utils.ToStr(dataother.AnnualId), "" , this.User.Id, "1", "业务处室审核通过")
+		var ActiComplete workflow.ActiCompleteVM
+		ActiComplete.ProcessKey = workflow.OIL_AUDIT_APPLY
+		ActiComplete.BusinessKey = utils.ToStr(dataother.AnnualId)
+		ActiComplete.UserNames = ""
+		ActiComplete.UserId = this.User.Id
+		ActiComplete.Result = "1"
+		ActiComplete.Remarks = "业务处室审核通过"
+		res := svcActiviti.TaskComplete(ActiComplete)
 		if res == "true" {
-			err := svc.UpdateEntityBytbl(""+OilAnnualAuditName, list.Id, entityempty, cols)
-			if err == nil {
-				errinfo.Message = "审核通过！"
-				errinfo.Code = 0
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-			} else {
-				errinfo.Message = "审核错误！"
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-			}
-		}else {
+			errinfo.Message = "审核通过！"
+			errinfo.Code = 0
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
 			errinfo.Message = "工作流异常，请联系管理员！"
 			errinfo.Code = -1
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 		}
-	}else if dataother.SuccessStatus == 4 {
+	} else if dataother.SuccessStatus == 4 {
 		var entityempty annualaudit.OilAnnualAudit
 		var errinfo ErrorInfo
-		var cols []string = []string{"Status", "Remark"}
+		//var cols []string = []string{"Status", "Remark"}
 		entityempty.Status = dataother.SuccessStatus
 		entityempty.Remark = dataother.AuditorRemark
 		//多实例工作流
 		svcActiviti := workflow.GetActivitiService(utils.DBE)
 		//多实例提交给下一步
-		res := svcActiviti.TaskComplete(workflow.OIL_AUDIT_APPLY, utils.ToStr(dataother.AnnualId), "", this.User.Id, "0", "业务处室审核未通过")
+		var ActiComplete workflow.ActiCompleteVM
+		ActiComplete.ProcessKey = workflow.OIL_AUDIT_APPLY
+		ActiComplete.BusinessKey = utils.ToStr(dataother.AnnualId)
+		ActiComplete.UserNames = ""
+		ActiComplete.UserId = this.User.Id
+		ActiComplete.Result = "0"
+		ActiComplete.Remarks = "业务处室审核未通过"
+		res := svcActiviti.TaskComplete(ActiComplete)
 		if res == "true" {
-			err := svc.UpdateEntityBytbl(""+OilAnnualAuditName, list.Id, entityempty, cols)
-			if err == nil {
-				errinfo.Message = "审核未通过！"
-				errinfo.Code = 0
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-			} else {
-				errinfo.Message = "审核错误！"
-				errinfo.Code = -1
-				this.Data["json"] = &errinfo
-				this.ServeJSON()
-			}
-		}else {
+			errinfo.Message = "审核未通过！"
+			errinfo.Code = 0
+			this.Data["json"] = &errinfo
+			this.ServeJSON()
+		} else {
 			errinfo.Message = "工作流异常，请联系管理员！"
 			errinfo.Code = -1
 			this.Data["json"] = &errinfo
 			this.ServeJSON()
 		}
 	}
-}
+}

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

@@ -251,7 +251,7 @@ func (this *InfoChangeController) AddEntity() {
 	_, err := svc.InsertEntityBytbl(""+OilAnnualAuditName, &model)
 	annualId := model.Id
 	//工作流开始
-	processInstanceId,_ := svc.SubmitOrgAudit(model.WorkflowId, utils.ToStr(model.CerId), utils.ToStr(model.Id), workflow.OIL_AUDIT_APPLY, workflow.FIRST_TRIAL, this.User.Id, "1", "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
+	processInstanceId,_ := svc.SubmitOrgAudit("",model.WorkflowId, utils.ToStr(model.CerId), utils.ToStr(model.Id), workflow.OIL_AUDIT_APPLY, workflow.FIRST_TRIAL, this.User.Id, "1", "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
 	var auditmodel annualaudit.OilAnnualAudit
 	auditmodel.WorkflowId = processInstanceId
 	cols := []string{

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

@@ -305,7 +305,7 @@ func (this *QualChangeController) AddEntity() {
 	_, err := svc.InsertEntityBytbl(""+OilAnnualAuditName, &model)
 	annualId := model.Id
 	//工作流开始
-	processInstanceId,_ := svc.SubmitOrgAudit(model.WorkflowId, utils.ToStr(model.CerId), utils.ToStr(model.Id), workflow.OIL_AUDIT_APPLY, workflow.FIRST_TRIAL, this.User.Id, "1", "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
+	processInstanceId,_ := svc.SubmitOrgAudit("", model.WorkflowId, utils.ToStr(model.CerId), utils.ToStr(model.Id), workflow.OIL_AUDIT_APPLY, workflow.FIRST_TRIAL, this.User.Id, "1", "提交给二级单位初审", OilSupplierCertSubName, OilClassOrgSettingName)
 	var auditmodel annualaudit.OilAnnualAudit
 	auditmodel.WorkflowId = processInstanceId
 	cols := []string{

src/dashoo.cn/frontend_web/src/components/workflow/wfhistory.vue

@@ -27,7 +27,7 @@
       </el-table-column>
     </el-table>
     <div style="margin-top:5px; text-align: center;">
-      <img :src="baseurl + 'workflow/historyimg/' + entryinfo.instance " v-if="entryinfo.instance">
+      <img :src="baseurl + 'workflow/historyimg/' + entryinfo.instance +'?t='+(new Date()).getTime() " v-if="entryinfo.instance">
     </div>
   </div>
 </template>

src/dashoo.cn/frontend_web/src/pages/oilsupplier/annualaudit/_opera/auditoperation.vue

@@ -556,7 +556,7 @@
             } else {
               this.$message({
                 type: 'warning',
-                message: "签发错误"
+                message: res.data.message
               })
             }
           })