|
|
@@ -678,14 +678,16 @@ func (this *OilSupplierCertController) CompanyAuditEntity() {
|
|
|
|
|
|
svcActiviti := workflow.GetActivitiService(utils.DBE)
|
|
|
//启动工作流
|
|
|
- businessKey := certId + "-" + strconv.Itoa(supplierCertEntity.AuditIndex)
|
|
|
+ businessKey := supplierCertEntity.BusinessKey
|
|
|
processInstanceId := supplierCertEntity.WorkflowId
|
|
|
// 如果被驳回，不再新启工作流
|
|
|
if processInstanceId == "" {
|
|
|
+ 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("工作流启动失败！")
|
|
|
}
|
|
|
+ supplierCertEntity.AuditIndex += 1
|
|
|
}
|
|
|
// 将启动和工作流，选择的初审和复审人员保存下来
|
|
|
cols := []string{
|
|
|
@@ -700,7 +702,6 @@ func (this *OilSupplierCertController) CompanyAuditEntity() {
|
|
|
supplierCertEntity.BusinessKey = businessKey
|
|
|
supplierCertEntity.WorkflowId = processInstanceId
|
|
|
supplierCertEntity.CommitComId = unitId
|
|
|
- supplierCertEntity.AuditIndex += 1
|
|
|
certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
|
|
|
|
|
|
var ActiComplete workflow.ActiCompleteVM
|
|
|
@@ -763,14 +764,17 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
|
|
|
|
|
|
svcActiviti := workflow.GetActivitiService(utils.DBE)
|
|
|
//启动工作流
|
|
|
- businessKey := certId + "-" + strconv.Itoa(supplierCertEntity.AuditIndex)
|
|
|
+ businessKey := supplierCertEntity.BusinessKey
|
|
|
processInstanceId := supplierCertEntity.WorkflowId
|
|
|
// 如果被驳回，不再新启工作流
|
|
|
if processInstanceId == "" {
|
|
|
+ //启动工作流
|
|
|
+ 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("工作流启动失败！")
|
|
|
}
|
|
|
+ supplierCertEntity.AuditIndex += 1
|
|
|
}
|
|
|
// 将启动和工作流，选择的初审和复审人员保存下来
|
|
|
cols := []string{
|
|
|
@@ -791,7 +795,6 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
|
|
|
supplierCertEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
|
|
|
supplierCertEntity.ThirdAudit, _ = strconv.Atoi(thirdAudit)
|
|
|
supplierCertEntity.CommitComId = strconv.Itoa(unitId)
|
|
|
- supplierCertEntity.AuditIndex += 1
|
|
|
certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
|
|
|
|
|
|
var ActiComplete workflow.ActiCompleteVM
|
