no message

controllers/statistic_report.go

@@ -3412,31 +3412,31 @@ func (this *StatisticReportController) IncrementalCompanyList() {
 
 	var conditionAscribRai string // 处理权益未续约客户检索列表SQL查询条件
 	var parsAscribeRai []interface{}
-	//是否确认续约 CRM 13.9
-	if isConfirm != -1 {
-		var conditionConfirm string
-		var parsConfirm []interface{}
+	var conditionConfirm string
+	var parsConfirm []interface{}
 
-		companyConfirmList, err := company.GetCompanyNoRenewedAscribeList(conditionConfirm, parsConfirm, 0, 0)
-		if err != nil && err.Error() != utils.ErrNoRow() {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取失败，GetCompanyNoRenewedAscribeList Err:" + err.Error()
-			return
-		}
-		var companyIds []int
-		if len(companyConfirmList) == 0 {
-			companyIds = append(companyIds, 0) // 给一个不存在的ID
-		} else {
-			for _, v := range companyConfirmList {
-				companyIds = append(companyIds, v.CompanyId)
-			}
+	companyConfirmList, err := company.GetCompanyNoRenewedAscribeList(conditionConfirm, parsConfirm, 0, 0)
+	if err != nil && err.Error() != utils.ErrNoRow() {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，GetCompanyNoRenewedAscribeList Err:" + err.Error()
+		return
+	}
+	var noRenewedcompanyIds []int //已经确定未续约的公司ID
+	if len(companyConfirmList) == 0 {
+		noRenewedcompanyIds = append(noRenewedcompanyIds, 0) // 给一个不存在的ID
+	} else {
+		for _, v := range companyConfirmList {
+			noRenewedcompanyIds = append(noRenewedcompanyIds, v.CompanyId)
 		}
+	}
+	//是否确认续约 CRM 13.9
+	if isConfirm != -1 {
 		if isConfirm == 0 {
-			conditionAscribRai += ` AND ( c.company_id NOT IN (` + utils.GetOrmInReplace(len(companyIds)) + `)  AND  c.product_id = 2 ) ` // 待确认
+			conditionAscribRai += ` AND ( c.company_id NOT IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)  AND  c.product_id = 2 ) ` // 待确认
 		} else {
-			conditionAscribRai += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(companyIds)) + `)   OR c.product_id = 1 )` // 已确认
+			conditionAscribRai += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)   OR c.product_id = 1 )` // 已确认
 		}
-		parsAscribeRai = append(parsAscribeRai, companyIds)
+		parsAscribeRai = append(parsAscribeRai, noRenewedcompanyIds)
 	}
 
 	//归因ID CRM 13.9
@@ -3710,7 +3710,12 @@ func (this *StatisticReportController) IncrementalCompanyList() {
 		pars1 = append(pars1, "try_out")
 		condition1 += ` AND c.status not in ("永续","正式","关闭")  `
 
-		total, err := models.GetIncrementalCompanyCountByOperationRecord(condition1, pars1)
+		//未续约这里只统计已经确定的
+		notRenewalCondition := condition1
+		notRenewalPars := pars1
+		notRenewalCondition += conditionAscribRai
+		notRenewalPars = append(notRenewalPars, parsAscribeRai)
+		total, err := models.GetIncrementalCompanyCountByOperationRecord(notRenewalCondition, notRenewalPars)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败，Err:" + err.Error()