|
|
@@ -231,9 +231,9 @@ func (this *OilSupplierCertAppendController) AddAppend() {
|
|
|
return
|
|
|
}
|
|
|
}
|
|
|
- style, _ :=strconv.Atoi(modeltmp[0].InStyle)
|
|
|
+ style, _ := strconv.Atoi(modeltmp[0].InStyle)
|
|
|
if style != 6 {
|
|
|
- id :=strconv.Itoa(modeltmp[0].SupplierId)
|
|
|
+ id := strconv.Itoa(modeltmp[0].SupplierId)
|
|
|
sqlCount := "select count(*) from OilSupplierCertAppend where SupplierId=" + id + " AND YEAR(CreateOn)=YEAR(NOW()) AND AppendType = '" + model.AppendType + "'"
|
|
|
var countRes, _ = svc.DBE.Query(sqlCount)
|
|
|
if len(countRes) > 0 {
|
|
|
@@ -815,7 +815,7 @@ func (this *OilSupplierCertAppendController) SeparateUnitSubmitAuditEntity() {
|
|
|
processInstanceId := supplierCertAppendEntity.WorkFlowId
|
|
|
// 如果被驳回,不再新启工作流
|
|
|
if processInstanceId == "" {
|
|
|
- businessKey := certAppendId + "-" + strconv.Itoa(supplierCertAppendEntity.AuditIndex)
|
|
|
+ businessKey = certAppendId + "-" + strconv.Itoa(supplierCertAppendEntity.AuditIndex)
|
|
|
processInstanceId = svcActiviti.StartProcess2(workflow.OIL_ENUSER_APPEND_APPLY, businessKey, this.User.Id, "1", supplierCertAppendEntity.AppendType, supplierEntity.SupplierName)
|
|
|
if len(processInstanceId) <= 0 {
|
|
|
panic("工作流启动失败!")
|
|
|
@@ -994,8 +994,8 @@ func (this *OilSupplierCertAppendController) AppendBusinessOfficeSeparateAuditEn
|
|
|
var ActiComplete workflow.ActiCompleteVM
|
|
|
ActiComplete.ProcessKey = workflow.OIL_ENUSER_APPEND_APPLY
|
|
|
ActiComplete.BusinessKey = supplierCertAppendEntity.BusinessKey
|
|
|
- ActiComplete.UserId = this.User.Id //审批人员
|
|
|
- ActiComplete.Result = "1" //前台审批[同意、不同意]
|
|
|
+ ActiComplete.UserId = this.User.Id //审批人员
|
|
|
+ ActiComplete.Result = "1" //前台审批[同意、不同意]
|
|
|
ActiComplete.UserNames = ProfessionalAudit // 直接分配业务处室专业审批人
|
|
|
ActiComplete.Remarks = AuditRemark
|
|
|
ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
|
|
|
@@ -1121,7 +1121,7 @@ func (this *OilSupplierCertAppendController) UpdateIsStorage() {
|
|
|
ActiComplete.ProcessKey = workflow.OIL_ENUSER_APPEND_APPLY
|
|
|
ActiComplete.BusinessKey = supplierCertAppendEntity.BusinessKey
|
|
|
ActiComplete.UserId = this.User.Id //审批人员
|
|
|
- ActiComplete.Result = "1" //前台审批[同意、不同意]
|
|
|
+ ActiComplete.Result = "1" //前台审批[同意、不同意]
|
|
|
ActiComplete.Remarks = AuditRemark
|
|
|
ActiComplete.CallbackUrl = utils.Cfg.MustValue("workflow", "callbackHost")
|
|
|
receiveVal := svcActiviti.TaskComplete(ActiComplete)
|
|
|
@@ -1689,7 +1689,7 @@ func (this *OilSupplierCertAppendController) UpdatePayStatus() {
|
|
|
}
|
|
|
|
|
|
if len(paymentInfoEntities) == 1 {
|
|
|
- for _, item := range paymentInfoEntities {
|
|
|
+ for _, item := range paymentInfoEntities {
|
|
|
if item.IsPay == "1" {
|
|
|
errinfo.Message = "已确认交费!请耐心等待"
|
|
|
errinfo.Code = -1
|
|
|
@@ -1705,7 +1705,7 @@ func (this *OilSupplierCertAppendController) UpdatePayStatus() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- sql :="UPDATE OilPaymentInfo SET IsPay ='1' where SrcId=" + certId
|
|
|
+ sql := "UPDATE OilPaymentInfo SET IsPay ='1' where SrcId=" + certId
|
|
|
supplierCerAppendtSrv.DBE.Exec(sql)
|
|
|
errinfo.Message = "确认交费成功!"
|
|
|
errinfo.Code = 0
|