循环调用

src/dashoo.cn/backend/api/business/oilsupplier/suppliercert/oilsuppliercertService.go

@@ -1,19 +1,17 @@
 package suppliercert
 
 import (
+	"dashoo.cn/backend/api/business/auditsetting"
+	"dashoo.cn/backend/api/business/oilsupplier/classorgsetting"
 	"dashoo.cn/backend/api/business/oilsupplier/supplier"
 	"dashoo.cn/backend/api/business/oilsupplier/supplierfile"
 	"dashoo.cn/backend/api/business/oilsupplier/supplierscenefile"
-	baseparameter "dashoo.cn/business2/parameter"
-	"strconv"
-	"strings"
-	"supplier_system/src/dashoo.cn/backend/api/business/oilsupplier/suppliercert"
-
-	"dashoo.cn/backend/api/business/auditsetting"
-	"dashoo.cn/backend/api/business/oilsupplier/classorgsetting"
 	"dashoo.cn/backend/api/business/workflow"
+	baseparameter "dashoo.cn/business2/parameter"
 	"dashoo.cn/business2/userRole"
 	"dashoo.cn/utils"
+	"strconv"
+	"strings"
 
 	"dashoo.cn/backend/api/business/oilsupplier/suppliercertsub"
 	. "dashoo.cn/backend/api/mydb"
@@ -30,89 +28,6 @@ func GetOilSupplierCertService(xormEngine *xorm.Engine) *OilSupplierCertService
 	return s
 }
 
-func (s *OilSupplierCertService) CheckOilSupplierCertIsNeedPayService(certId string) int {
-	var supplierCertEntity suppliercert.OilSupplierCert
-	s.GetEntityById(certId, &supplierCertEntity)
-
-	var isPayList []string
-	isPayList = append(isPayList, suppliercert.PINGSHEN)
-	isPayList = append(isPayList, suppliercert.WAIBUSHICHANG)
-	var unPayList []string
-	unPayList = append(unPayList, suppliercert.YIJIWUZI)
-	unPayList = append(unPayList, suppliercert.ERJIWUZI)
-	unPayList = append(unPayList, suppliercert.ZHANLUEHEZUO)
-	unPayList = append(unPayList, suppliercert.NEIBUDUOYUAN)
-
-	result := 0
-	isPay := "false"
-	unPay := "false"
-	for _, eachItem := range isPayList {
-		if eachItem == supplierCertEntity.InStyle {
-			// 需要付费
-			isPay = "true"
-			result = 1
-			break
-		}
-	}
-	for _, eachItem := range unPayList {
-		if eachItem == supplierCertEntity.InStyle {
-			// 不需要付费
-			unPay = "true"
-			result = 2
-			break
-		}
-	}
-	if isPay == unPay {
-		// 准入类型是否付费有误！请联系管理员
-		result = 0
-	}
-
-	return result
-}
-
-func (s *OilSupplierCertService) CheckOilSupplierCertIsNeedConcentrateAuditService(certId string) int {
-	var supplierCertEntity suppliercert.OilSupplierCert
-	s.GetEntityById(certId, &supplierCertEntity)
-
-	// 需要集中评审的准入类型
-	var concentrateInStyleList []string
-	concentrateInStyleList = append(concentrateInStyleList, suppliercert.PINGSHEN)
-	concentrateInStyleList = append(concentrateInStyleList, suppliercert.NEIBUDUOYUAN)
-	// 不需要集中评审的准入类型
-	var unConcentrateInStyleList []string
-	unConcentrateInStyleList = append(unConcentrateInStyleList, suppliercert.YIJIWUZI)
-	unConcentrateInStyleList = append(unConcentrateInStyleList, suppliercert.ERJIWUZI)
-	unConcentrateInStyleList = append(unConcentrateInStyleList, suppliercert.ZHANLUEHEZUO)
-	unConcentrateInStyleList = append(unConcentrateInStyleList, suppliercert.WAIBUSHICHANG)
-
-	result := 0
-	isConcentrateAudit := "false"
-	unConcentrateAudit := "false"
-	for _, eachItem := range concentrateInStyleList {
-		if eachItem == supplierCertEntity.InStyle {
-			// 需要集中评审
-			isConcentrateAudit = "true"
-			result = 1
-			break
-		}
-	}
-	for _, eachItem := range unConcentrateInStyleList {
-		if eachItem == supplierCertEntity.InStyle {
-			// 不需要集中评审
-			unConcentrateAudit = "true"
-			result = 2
-			break
-		}
-	}
-
-	if isConcentrateAudit == unConcentrateAudit {
-		// 准入类型评审方式错误！请联系管理员
-		result = 0
-	}
-
-	return result
-}
-
 //通用多部门多实例审核方法
 func (s *OilSupplierCertService) SubmitOrgAudit(certId, wfName, wfNodeCode, userId, result, remarks, OilSupplierCertSubName, OilClassOrgSettingName string, status string, step string) (processInstanceId, res string) {
 	//取出审批列表

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

@@ -208,8 +208,9 @@ func (this *OilSupplierCertListenerController) CheckNeedConcentrateAudit() {
 	businessKey := this.GetString("businessKey")
 	supplierCertId := strings.Split(businessKey, "-")[0]
 
-	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
-	result := certSrv.CheckOilSupplierCertIsNeedConcentrateAuditService(supplierCertId)
+	//certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+	checkStatus := suppliercert.OilSupplierCertCheckStatus{}
+	result := checkStatus.CheckOilSupplierCertIsNeedConcentrateAuditService(supplierCertId)
 	this.Data["json"] = result
 	this.ServeJSON()
 }
@@ -253,8 +254,9 @@ func (this *OilSupplierCertListenerController) CheckNeedPay() {
 	businessKey := this.GetString("businessKey")
 	supplierCertId := strings.Split(businessKey, "-")[0]
 
-	certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
-	result := certSrv.CheckOilSupplierCertIsNeedPayService(supplierCertId)
+	//certSrv := suppliercert.GetOilSupplierCertService(utils.DBE)
+	checkStatus := suppliercert.OilSupplierCertCheckStatus{}
+	result := checkStatus.CheckOilSupplierCertIsNeedPayService(supplierCertId)
 
 	this.Data["json"] = result
 	this.ServeJSON()