|
@@ -711,7 +711,7 @@ func (this *OilSupplierCertController) CompanyAuditEntity() {
|
|
|
supplierCertEntity.BusinessKey = businessKey
|
|
supplierCertEntity.BusinessKey = businessKey
|
|
|
supplierCertEntity.WorkflowId = processInstanceId
|
|
supplierCertEntity.WorkflowId = processInstanceId
|
|
|
supplierCertEntity.CommitComId = unitId
|
|
supplierCertEntity.CommitComId = unitId
|
|
|
- certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
|
|
|
|
|
|
|
+ certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols) // 不能在下一步工作流完成后再更新,会找不到分办人
|
|
|
|
|
|
|
|
var ActiComplete workflow.ActiCompleteVM
|
|
var ActiComplete workflow.ActiCompleteVM
|
|
|
ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
|
|
ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
|
|
@@ -733,9 +733,9 @@ func (this *OilSupplierCertController) CompanyAuditEntity() {
|
|
|
// @router /unit-audit/:id [post]
|
|
// @router /unit-audit/:id [post]
|
|
|
func (this *OilSupplierCertController) UnitAuditEntity() {
|
|
func (this *OilSupplierCertController) UnitAuditEntity() {
|
|
|
certId := this.Ctx.Input.Param(":id")
|
|
certId := this.Ctx.Input.Param(":id")
|
|
|
- firstAudit := this.GetString("FirstAudit")
|
|
|
|
|
- secondAudit := this.GetString("SecondAudit")
|
|
|
|
|
- thirdAudit := this.GetString("ThirdAudit")
|
|
|
|
|
|
|
+ firstAudit := this.GetString("FirstAudit") // 初审人ID
|
|
|
|
|
+ secondAudit := this.GetString("SecondAudit") // 复审人ID
|
|
|
|
|
+ thirdAudit := this.GetString("ThirdAudit") // 专业处室部门ID
|
|
|
// typeCode := this.GetString("TypeCode")
|
|
// typeCode := this.GetString("TypeCode")
|
|
|
AuditRemark := this.GetString("AuditRemark")
|
|
AuditRemark := this.GetString("AuditRemark")
|
|
|
userId := this.User.Id
|
|
userId := this.User.Id
|
|
@@ -760,6 +760,9 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
|
|
|
}
|
|
}
|
|
|
}()
|
|
}()
|
|
|
|
|
|
|
|
|
|
+ if firstAudit == "" || secondAudit == "" {
|
|
|
|
|
+ panic("请选择审批人")
|
|
|
|
|
+ }
|
|
|
//取出准入表信息
|
|
//取出准入表信息
|
|
|
certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
|
|
certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
|
|
|
var supplierCertEntity suppliercert.OilSupplierCert
|
|
var supplierCertEntity suppliercert.OilSupplierCert
|
|
@@ -804,7 +807,7 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
|
|
|
supplierCertEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
|
|
supplierCertEntity.SecondAudit, _ = strconv.Atoi(secondAudit)
|
|
|
supplierCertEntity.ThirdAudit, _ = strconv.Atoi(thirdAudit)
|
|
supplierCertEntity.ThirdAudit, _ = strconv.Atoi(thirdAudit)
|
|
|
supplierCertEntity.CommitComId = strconv.Itoa(unitId)
|
|
supplierCertEntity.CommitComId = strconv.Itoa(unitId)
|
|
|
- certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols)
|
|
|
|
|
|
|
+ certSrv.UpdateEntityByIdCols(certId, supplierCertEntity, cols) // 不能在下一步工作流完成后再更新,会找不到初审人
|
|
|
|
|
|
|
|
var ActiComplete workflow.ActiCompleteVM
|
|
var ActiComplete workflow.ActiCompleteVM
|
|
|
ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
|
|
ActiComplete.ProcessKey = workflow.OIL_ENUSER_SUPPLIER_APPLY
|
|
@@ -816,7 +819,7 @@ func (this *OilSupplierCertController) UnitAuditEntity() {
|
|
|
ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
|
|
ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
|
|
|
receiveVal := svcActiviti.TaskComplete(ActiComplete)
|
|
receiveVal := svcActiviti.TaskComplete(ActiComplete)
|
|
|
if receiveVal != "true" {
|
|
if receiveVal != "true" {
|
|
|
- panic("工作流异常,请联系管理员!" + receiveVal)
|
|
|
|
|
|
|
+ panic("提交失败,请刷新!")
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -849,6 +852,10 @@ func (this *OilSupplierCertController) SeparateAuditEntity() {
|
|
|
}
|
|
}
|
|
|
}()
|
|
}()
|
|
|
|
|
|
|
|
|
|
+ if firstAudit == "" || secondAudit == "" {
|
|
|
|
|
+ panic("请选择审批人")
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
// 取出准入表信息
|
|
// 取出准入表信息
|
|
|
certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
|
|
certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
|
|
|
var supplierCertEntity suppliercert.OilSupplierCert
|
|
var supplierCertEntity suppliercert.OilSupplierCert
|
|
@@ -877,7 +884,7 @@ func (this *OilSupplierCertController) SeparateAuditEntity() {
|
|
|
ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
|
|
ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
|
|
|
receiveVal := svcActiviti.TaskComplete(ActiComplete)
|
|
receiveVal := svcActiviti.TaskComplete(ActiComplete)
|
|
|
if receiveVal != "true" {
|
|
if receiveVal != "true" {
|
|
|
- panic("工作流异常,请联系管理员!" + receiveVal)
|
|
|
|
|
|
|
+ panic("任务已审批,请刷新!")
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|