no message

controllers/statistic_company_merge.go

@@ -1777,7 +1777,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
 	pars1 = append(pars1, startDate, endDate)
 	//condition1 += ` AND a.rai_contract_type = ? `
 	//pars1 = append(pars1, "续约合同")
-	condition1 += ` AND  a.company_ascribe_id  > 0 AND  a.company_ascribe_id  !=9   ` // 已确认未续约
+	condition1 += ` AND  a.company_ascribe_id  > 0 AND  a.company_ascribe_id  !=9    AND c.STATUS NOT IN ( "永续", "正式", "关闭" )  ` // 已确认未续约
 
 	totalNo, err := company.GetIncrementalRenewalCompanyProductMergeCount(condition1, pars1)
 	if err != nil && err.Error() != utils.ErrNoRow() {
@@ -1979,7 +1979,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListExpor
 
 	//权益有效合同
 	condition += ` AND c.product_id = 2   AND  a.status = 1 `
-	condition += ` AND c.status not in ("永续","正式","关闭")  `
+
 	//var list []*models.IncrementalList
 
 	condition1 := condition
@@ -1987,6 +1987,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListExpor
 	condition1 += ` AND a.end_date >= ? AND a.end_date <= ? `
 	pars1 = append(pars1, startDate, endDate)
 	condition1 += ` AND  a.company_ascribe_id  > 0 AND  a.company_ascribe_id  !=9   ` // 已确认未续约
+	condition1 += ` AND c.status not in ("永续","正式","关闭")  `
 
 	//if contractDataType == "续约合同" || contractDataType == "确认不续约合同" {
 	//不续约列表数据
@@ -2012,6 +2013,8 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListExpor
 		return
 	}
 
+	//return
+
 	var companyContractIds []int
 	for _, v := range listRenewal {
 		companyContractIds = append(companyContractIds, v.CompanyContractId)
@@ -2178,13 +2181,13 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListExpor
 
 		//mapData := make(map[int]*response.IncrementalCompanyPercentageExportResp)
 		for _, v := range listRenewal {
-			mapNoRenewalContractTotal[v.SellerId]++
-			mapNoRenewalContractMoney[v.SellerId] += v.Money
+			mapNoRenewalContractTotal[v.SellerIdLast]++
+			mapNoRenewalContractMoney[v.SellerIdLast] += v.Money
 		}
 
 		for _, v := range listEndDate {
-			mapExpireRenewalContractTotal[v.SellerId]++
-			mapExpireRenewalContractMoney[v.SellerId] += v.Money
+			mapExpireRenewalContractTotal[v.SellerIdLast]++
+			mapExpireRenewalContractMoney[v.SellerIdLast] += v.Money
 		}
 
 		for _, item := range listRaiSeller {