fix：客户审批 冻结转试用，新增冻结次数

controllers/approval.go

@@ -119,20 +119,31 @@ func (c *ApprovalCommon) ListOld() {
 			}
 		}
 
-		approvalCount, err := company_approval.GetCompanyApprovalCount(item.CompanyId, item.ProductId)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			c.FailWithMessage("获取失败", "获取延期审批次数失败，Err:"+err.Error())
-			return
-		}
-		list[i].ApprovalCount = approvalCount
-
-		if item.ApplyMethod == 3 {
+		switch item.ApplyMethod {
+		case 2:
+			//客户冻结转试用次数
+			approvalCount, err := company_approval.GetFreezeToTryCompanyApprovalCount(item.CompanyId, item.ProductId, item.ApplyUserId)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				c.FailWithMessage("获取失败", "获取冻结转试用审批次数失败，Err:"+err.Error())
+				return
+			}
+			list[i].ApprovalCount = approvalCount
+		case 3:
+			//延迟试用权限列表
 			delayPermission, err := company_delay_permission.GetApplyDelayPermission(item.CompanyApprovalId)
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				c.FailWithMessage("获取失败", "获取延期审批权限失败，Err:"+err.Error())
 				return
 			}
 			list[i].DelayPermission = delayPermission
+
+			//客户审批试用延期次数
+			approvalCount, err := company_approval.GetCompanyTryDelayApprovalCount(item.CompanyId, item.ProductId)
+			if err != nil && err.Error() != utils.ErrNoRow() {
+				c.FailWithMessage("获取失败", "获取延期审批次数失败，Err:"+err.Error())
+				return
+			}
+			list[i].ApprovalCount = approvalCount
 		}
 		if item.ApproveRoleTypeCode == roleTypeCode {
 			list[i].OpButton = true
@@ -188,12 +199,24 @@ func (c *ApprovalCommon) DetailOld() {
 		}
 	}
 
-	approvalCount, err := company_approval.GetCompanyApprovalCount(item.CompanyId, item.ProductId)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		c.FailWithMessage("获取失败", "获取延期审批次数失败，Err:"+err.Error())
-		return
+	switch item.ApplyMethod {
+	case 2:
+		//客户冻结转试用次数
+		approvalCount, err := company_approval.GetFreezeToTryCompanyApprovalCount(item.CompanyId, item.ProductId, item.ApplyUserId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			c.FailWithMessage("获取失败", "获取冻结转试用审批次数失败，Err:"+err.Error())
+			return
+		}
+		item.ApprovalCount = approvalCount
+	case 3:
+		//客户审批试用延期次数
+		approvalCount, err := company_approval.GetCompanyTryDelayApprovalCount(item.CompanyId, item.ProductId)
+		if err != nil && err.Error() != utils.ErrNoRow() {
+			c.FailWithMessage("获取失败", "获取延期审批次数失败，Err:"+err.Error())
+			return
+		}
+		item.ApprovalCount = approvalCount
 	}
-	item.ApprovalCount = approvalCount
 
 	//if item.ApplyMethod == 3 {
 	//	delayPermission, err := company_delay_permission.GetApplyDelayPermission(item.CompanyApprovalId)

models/tables/company_approval/company_approval.go

@@ -903,7 +903,7 @@ func GetCompanyTryDelayApprovalCount(companyId, productId int) (count int, err e
 	return
 }
 
-// GetFreezeToTryCompanyApprovalCount 客户冻结转试用次数
+// GetFreezeToTryCompanyApprovalCount 客户冻结转试用次数（某个销售下）
 func GetFreezeToTryCompanyApprovalCount(companyId, productId, applyUserId int) (count int, err error) {
 	sql := `SELECT COUNT(1) AS count FROM company_approval WHERE company_id=? AND product_id=? AND  approve_content='冻结转试用' and apply_user_id = ? `
 	o := orm.NewOrm()