no message

controllers/statistic_company_merge.go

@@ -360,14 +360,6 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 		condition1 += condition
 		pars1 = append(pars1, pars)
 
-		if isConfirm != 2 {
-			condition1 += `  AND a.not_renewal_hide = 0 `
-			condition1 += ` AND c.status not in ("永续","正式","关闭")  `
-		}
-
-		if isConfirm == 1 {
-			condition1 += ` AND  a.company_ascribe_id  > 0 AND  a.company_ascribe_id  !=9   ` // 已确认未续约
-		}
 		condition1 += `    AND a.status = 1  AND  a.end_date >= ? AND a.end_date  <= ? `
 		pars1 = append(pars1, startDate, endDate)
 		//condition1 += ` AND a.operation = ? `
@@ -380,6 +372,12 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 			condition1, pars1 = getQueryParamsLast(condition1, pars1, sysUser, "c.")
 		}
 
+		//未续约待确认数量
+		notRenewalToBeCondition := condition1
+		notRenewalToBePars := pars1
+		notRenewalToBeCondition += conditionAscribRaiToBeTotal
+		notRenewalToBePars = append(notRenewalToBePars, parsAscribeRaiTobeTotal)
+
 		//未续约已确认数量
 		notRenewalCondition := condition1
 		notRenewalPars := pars1
@@ -392,11 +390,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 			return
 		}
 		notRenewalCompanyTotal = total
-		//未续约待确认数量
-		notRenewalToBeCondition := condition1
-		notRenewalToBePars := pars1
-		notRenewalToBeCondition += conditionAscribRaiToBeTotal
-		notRenewalToBePars = append(notRenewalToBePars, parsAscribeRaiTobeTotal)
+
 		notRenewalCompanyToBeConfirmTotal, err = company.GetIncrementalRenewalCompanyProductMergeCount(notRenewalToBeCondition, notRenewalToBePars)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
@@ -404,6 +398,14 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 			return
 		}
 
+		if isConfirm != 2 {
+			condition1 += `  AND a.not_renewal_hide = 0 `
+			condition1 += ` AND c.status not in ("永续","正式","关闭")  `
+		}
+
+		if isConfirm == 1 {
+			condition1 += ` AND  a.company_ascribe_id  > 0 AND  a.company_ascribe_id  !=9   ` // 已确认未续约
+		}
 		condition1 += conditionAscribRai
 		pars1 = append(pars1, parsAscribeRai)
 		if dataType == "未续约客户" {
@@ -1997,7 +1999,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListExpor
 	conditionEnd1 := condition
 	parsEnd1 := pars
 
-	conditionEnd1 += ` AND a.end_date >= ? AND a.end_date <= ?  AND  a.company_ascribe_id  !=9   `
+	conditionEnd1 += ` AND a.end_date >= ? AND a.end_date <= ?     `
 	parsEnd1 = append(parsEnd1, startDate, endDate)
 
 	//if contractDataType == "到期合同" {