后端: 信息变更驳回后删除时对公工作流的删除。

src/dashoo.cn/backend/api/controllers/oilcontract/contractReview.go

@@ -788,9 +788,9 @@ func (this *OilContractReviewController) DeleteEntity() {
 		if model.WorkflowId != "" && model.WorkflowId != "0" {
 			deleteProcessVM.ProcessInstanceId = model.WorkflowId
 			if model.Status == "8" {
-				deleteProcessVM.DeleteReason = "企管法规处删除"
+				deleteProcessVM.DeleteReason = "企管法规处删除日常评价"
 			} else {
-				deleteProcessVM.DeleteReason = "未审批通过，被申请人删除"
+				deleteProcessVM.DeleteReason = "日常评价审批未通过后，被申请人删除"
 			}
 			activitiService.DeleteComplete(deleteProcessVM)
 		}

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

@@ -1196,7 +1196,7 @@ func (this *AnnualAuditController) DeleteEntity() {
 		var deleteProcessVM workflow.DeleteProcessVM
 		if model.WorkflowId != "" && model.WorkflowId != "0" {
 			deleteProcessVM.ProcessInstanceId = model.WorkflowId
-			deleteProcessVM.DeleteReason = "审批未通过，被申请人删除"
+			deleteProcessVM.DeleteReason = "年审申请审批未通过后，被申请人删除"
 			activitiService.DeleteComplete(deleteProcessVM)
 		}
 

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

@@ -778,6 +778,13 @@ func (this *InfoChangeController) DelInfoChangech() {
 	err = svc.DeleteEntityBytbl(OilSupplierFileName, where)
 
 	if err == nil {
+		activitiService := workflow.GetActivitiService(utils.DBE)
+		var deleteProcessVM workflow.DeleteProcessVM
+		if infoChange.WorkFlowId != "" && infoChange.WorkFlowId != "0" {
+			deleteProcessVM.ProcessInstanceId = infoChange.WorkFlowId
+			deleteProcessVM.DeleteReason = "信息变更审批未通过后，被申请人删除"
+			activitiService.DeleteComplete(deleteProcessVM)
+		}
 		errinfo.Message = "删除成功"
 		errinfo.Code = 0
 		this.Data["json"] = &errinfo
@@ -2159,10 +2166,10 @@ func (this *InfoChangeController) updateChangeInfo(supplierId int, infoId string
 			user.Realname = item.ChangeInfo
 			var cor register.OilCorporateInfo
 			var supplier supplier.OilSupplier
-			svc.GetEntityByWhere(OilSupplierName,"Id = " + strconv.Itoa(supplierId),&supplier)
-			svc.GetEntityByWhere(OilCorporateInfoName,"CommercialNo = '" + supplier.CommercialNo + "'",&cor)
+			svc.GetEntityByWhere(OilSupplierName, "Id = "+strconv.Itoa(supplierId), &supplier)
+			svc.GetEntityByWhere(OilCorporateInfoName, "CommercialNo = '"+supplier.CommercialNo+"'", &cor)
 			if cor.UserId > 0 {
-				svc.UpdateEntityBywheretbl("Base_User", &user, []string{"RealName"}, "Id = " + strconv.Itoa(cor.UserId))
+				svc.UpdateEntityBywheretbl("Base_User", &user, []string{"RealName"}, "Id = "+strconv.Itoa(cor.UserId))
 			}
 		}
 	}