审批驳回工作流

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

@@ -315,6 +315,7 @@ func (this *OilAnnualListenerController) WorkflowEndAudit() {
 // @router /approval-refuse [get]
 func (this *OilAnnualListenerController) ApprovalRefuse() {
 	businessKey := this.GetString("businessKey")
+	stepCodeStatus := this.GetString("stepCode")
 	annualId := strings.Split(businessKey, "-")[0]
 	srv := annualaudit.GetOilAnnualAuditService(utils.DBE)
 	var annualEntity annualaudit.OilAnnualAudit
@@ -325,7 +326,7 @@ func (this *OilAnnualListenerController) ApprovalRefuse() {
 		"Status",
 	}
 	//进入此步骤，记录在数据库中
-	annualEntity.Status = suppliercert.DRAFT_STATUS //重置为草稿状态
+	annualEntity.Status = stepCodeStatus
 	srv.UpdateEntityByIdCols(annualId, annualEntity, cols)
 
 	// 获取准入资质信息：

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

@@ -686,6 +686,22 @@ func (this *PaymentInfoController) ReceiveMoneyBillList() {
 
 	svc.InsertEntity(&invoiceInfo)
 
+	userSvc := userRole.GetUserService(utils.DBE)
+	paramSvc := baseparameter.GetBaseparameterService(utils.DBE)
+	financeRoleId := paramSvc.GetBaseparameterMessage("", "paramset", "FinanceRoleId")
+	ids := userSvc.GetUserIdsByRoleId(financeRoleId)
+	tempStr := strings.Join(ids, ",")
+	uids := strings.Replace(tempStr, "uid_", "", -1)
+	uids = strings.Trim(uids, ",")
+
+	businessKey := strconv.Itoa(invoiceInfo.Id)
+	result := "1"
+	processInstanceId := svcActiviti.StartProcess2(workflow.OIL_SUPPLIER_VERIFY, businessKey, uids, result, "04", suppentity.SupplierName)
+	invoiceInfo.WorkflowId = processInstanceId
+	cols := []string{"WorkflowId"}
+	svc.UpdateEntityByIdCols(invoiceInfo.Id, &invoiceInfo, cols)
+
+
 	//记录对账日志
 	paymentBankInfo := new(paymentbankinfo.OilPaymentBankInfo)
 	paymentBankInfo.BillIds = billParams.Ids

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

@@ -334,6 +334,7 @@ func (this *OilSupplierCertAppendListenerController) WorkflowEndAudit() {
 // @router /approval-refuse [get]
 func (this *OilSupplierCertAppendListenerController) ApprovalRefuse() {
 	businessKey := this.GetString("businessKey")
+	stepCodeStatus := this.GetString("stepCode")
 	supplierCertAppendId := strings.Split(businessKey, "-")[0]
 	certSrv := suppliercertappend.GetOilSupplierCertAppendService(utils.DBE)
 	var supplierCertAppendEntity suppliercertappend.OilSupplierCertAppend
@@ -344,7 +345,7 @@ func (this *OilSupplierCertAppendListenerController) ApprovalRefuse() {
 		"Status",
 	}
 	//进入此步骤，记录在数据库中
-	supplierCertAppendEntity.Status = suppliercert.DRAFT_STATUS //重置为草稿状态
+	supplierCertAppendEntity.Status = stepCodeStatus
 	certSrv.UpdateEntityByIdCols(supplierCertAppendId, supplierCertAppendEntity, cols)
 
 	//supplierSrv := supplier.GetOilSupplierService(utils.DBE)

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

@@ -423,6 +423,7 @@ func (this *OilSupplierCertListenerController) WorkflowEndAudit() {
 // @router /approval-refuse [get]
 func (this *OilSupplierCertListenerController) ApprovalRefuse() {
 	businessKey := this.GetString("businessKey")
+	stepCodeStatus := this.GetString("stepCode")
 	supplierCertId := strings.Split(businessKey, "-")[0]
 	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
 	var supplierCertEntity suppliercert.OilSupplierCert
@@ -436,7 +437,7 @@ func (this *OilSupplierCertListenerController) ApprovalRefuse() {
 		"Status",
 	}
 	//进入此步骤，记录在数据库中
-	supplierCertEntity.Status = suppliercert.DRAFT_STATUS //重置为草稿状态
+	supplierCertEntity.Status = stepCodeStatus
 	certSrv.UpdateEntityByIdCols(supplierCertId, supplierCertEntity, cols)
 	// 发送驳回通知短信
 	//this.AuditRejectNotice(supplierCertEntity, supplierEntity)