no message

controllers/statistic_company_merge.go

@@ -362,12 +362,16 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 
 		if isConfirm != 2 {
 			condition1 += `  AND a.not_renewal_hide = 0 `
+			condition1 += ` AND c.status not in ("永续","正式","关闭")  `
 		}
-		condition1 += `    AND a.status = 1 AND a.start_date >= '2020-01-01' AND  a.end_date >= ? AND a.end_date  <= ? `
+
+		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 = ? `
 		//pars1 = append(pars1, "try_out")
-		condition1 += ` AND c.status not in ("永续","正式","关闭")  `
 
 		//销售筛选条件
 		if adminId != "" {
@@ -1672,10 +1676,10 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
 
 	//条件
 	if adminId != "" {
-		condition += ` AND c.seller_id in  (` + adminId + `) `
+		condition += ` AND a.seller_id_last in  (` + adminId + `) `
 	} else {
 		//根据当前角色来获取查询条件
-		condition, pars = getQueryParams(condition, pars, sysUser, "c.")
+		condition, pars = getQueryParamsLast(condition, pars, sysUser, "c.")
 	}
 
 	//权益有效合同
@@ -1812,7 +1816,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
 	//	condition1 += ` AND a.end_date >= ? AND a.end_date <= ? `
 	//}
 
-	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)
 
 	//condition1 += ` AND a.start_date  < ?   `
@@ -1882,6 +1886,7 @@ func (this *StatisticCompanyMergerController) CompanyContractPercentageListV2()
 			v.AscribeContent = mapGetCompanyAscribeContent[v.CompanyContractId]
 			v.IsShowNoRenewedNote = true
 		}
+		v.SellerName = v.SellerNameLast
 	}
 
 	page := paging.GetPaging(currentIndex, pageSize, dataTotal)