|
|
@@ -7,6 +7,7 @@ import (
|
|
|
"dashoo.cn/backend/api/business/oilsupplier/supplier"
|
|
|
"dashoo.cn/backend/api/business/organize"
|
|
|
"dashoo.cn/business2/permission"
|
|
|
+ "log"
|
|
|
"sync"
|
|
|
|
|
|
"dashoo.cn/backend/api/business/baseUser"
|
|
|
@@ -812,7 +813,7 @@ func (this *OilContractReviewController) CommonAuditEntity() {
|
|
|
} else {
|
|
|
//返回正确结果
|
|
|
if result == "1" {
|
|
|
- errinfo.Message = "审核提交成功"
|
|
|
+ errinfo.Message = "审核提交成功,请耐心等待批处理结果"
|
|
|
} else {
|
|
|
errinfo.Message = "审核驳回成功"
|
|
|
}
|
|
|
@@ -844,7 +845,7 @@ func (this *OilContractReviewController) CommonAuditEntity() {
|
|
|
go func() {
|
|
|
receiveVal := svcActiviti.TaskComplete(ActiComplete)
|
|
|
if receiveVal != "true" {
|
|
|
- panic("工作流异常,请联系管理员!" + receiveVal)
|
|
|
+ log.Print("日常评价 工作流异常,业务ID:" + contractReviewEntity.BusinessKey + ",工作流信息:" + receiveVal)
|
|
|
}
|
|
|
}()
|
|
|
lock.Unlock()
|
|
|
@@ -870,7 +871,7 @@ func (this *OilContractReviewController) BusinessOfficeSeparateAuditEntity() {
|
|
|
this.ServeJSON()
|
|
|
} else {
|
|
|
//返回正确结果
|
|
|
- errInfo.Message = "审核提交成功"
|
|
|
+ errInfo.Message = "审核提交成功,请耐心等待批处理结果"
|
|
|
errInfo.Code = 0
|
|
|
this.Data["json"] = &errInfo
|
|
|
this.ServeJSON()
|
|
|
@@ -906,18 +907,19 @@ func (this *OilContractReviewController) BusinessOfficeSeparateAuditEntity() {
|
|
|
go func() {
|
|
|
receiveVal := svcActiviti.TaskComplete(ActiComplete)
|
|
|
if receiveVal != "true" {
|
|
|
- panic("工作流异常,请联系管理员!" + receiveVal)
|
|
|
+ log.Print("日常评价 工作流异常,业务ID:" + contractReviewEntity.BusinessKey + ",工作流信息:" + receiveVal)
|
|
|
+ } else {
|
|
|
+ cols := []string{
|
|
|
+ "Id",
|
|
|
+ "Status",
|
|
|
+ "ProfessionalAudit",
|
|
|
+ }
|
|
|
+ supplierCertId := strings.Split(contractReviewEntity.BusinessKey, "-")[0]
|
|
|
+ contractReviewEntity.Status = suppliercert.PROF_AUDIT_STATUS //专业处室接收
|
|
|
+ contractReviewEntity.ProfessionalAudit, _ = strconv.Atoi(ProfessionalAudit)
|
|
|
+ conRev.UpdateEntityByIdCols(supplierCertId, contractReviewEntity, cols)
|
|
|
+ fmt.Println("业务处室分办协程!" + strconv.Itoa(i))
|
|
|
}
|
|
|
- cols := []string{
|
|
|
- "Id",
|
|
|
- "Status",
|
|
|
- "ProfessionalAudit",
|
|
|
- }
|
|
|
- supplierCertId := strings.Split(contractReviewEntity.BusinessKey, "-")[0]
|
|
|
- contractReviewEntity.Status = suppliercert.PROF_AUDIT_STATUS //专业处室接收
|
|
|
- contractReviewEntity.ProfessionalAudit, _ = strconv.Atoi(ProfessionalAudit)
|
|
|
- conRev.UpdateEntityByIdCols(supplierCertId, contractReviewEntity, cols)
|
|
|
- fmt.Println("业务处室分办协程!" + strconv.Itoa(i))
|
|
|
}()
|
|
|
lock.Unlock()
|
|
|
}
|