소스 검색

根据工作流id是否存在决定是否启动工作流(审批驳回)

baichengfei 5 년 전
부모
커밋
70b255fba2
1개의 변경된 파일15개의 추가작업 그리고 4개의 파일을 삭제
  1. 15 4
      src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

+ 15 - 4
src/dashoo.cn/backend/api/controllers/oilsupplier/suppliercert.go

@@ -647,9 +647,13 @@ func (this *OilSupplierCertController) CompanyAuditEntity() {
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	//启动工作流
 	businessKey := certId + "-" + strconv.Itoa(supplierCertEntity.AuditIndex)
-	processInstanceId := svcActiviti.StartProcess2(workflow.OIL_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id, "1", supplierCertEntity.SupplierTypeCode, supplierEntity.SupplierName)
-	if len(processInstanceId) <= 0 {
-		panic("工作流启动失败!")
+	processInstanceId := supplierCertEntity.WorkflowId
+	// 如果被驳回,不再新启工作流
+	if processInstanceId == "" {
+		processInstanceId := svcActiviti.StartProcess2(workflow.OIL_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id, "1", supplierCertEntity.SupplierTypeCode, supplierEntity.SupplierName)
+		if len(processInstanceId) <= 0 {
+			panic("工作流启动失败!")
+		}
 	}
 	// 将启动和工作流,选择的初审和复审人员保存下来
 	cols := []string{
@@ -736,7 +740,14 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
 	svcActiviti := workflow.GetActivitiService(utils.DBE)
 	//启动工作流
 	businessKey := certId + "-" + strconv.Itoa(supplierCertEntity.AuditIndex)
-	processInstanceId := svcActiviti.StartProcess2(workflow.OIL_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id, "1", supplierCertEntity.SupplierTypeCode, supplierEntity.SupplierName)
+	processInstanceId := supplierCertEntity.WorkflowId
+	// 如果被驳回,不再新启工作流
+	if processInstanceId == "" {
+		processInstanceId := svcActiviti.StartProcess2(workflow.OIL_ENUSER_SUPPLIER_APPLY, businessKey, this.User.Id, "1", supplierCertEntity.SupplierTypeCode, supplierEntity.SupplierName)
+		if len(processInstanceId) <= 0 {
+			panic("工作流启动失败!")
+		}
+	}
 	// 将启动和工作流,选择的初审和复审人员保存下来
 	cols := []string{
 		"Id",