no message

controllers/statistic_report.go

@@ -3432,13 +3432,13 @@ func (this *StatisticReportController) IncrementalCompanyList() {
 		}
 	}
 	//是否确认续约 CRM 13.9
-	conditionAscribRaiTotal += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)   OR c.product_id = 1 )` // 已确认
+	conditionAscribRaiTotal += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)   OR c.product_id = 1  OR   c.end_date <  '2023-01-01'  )   ` // 已确认
 	parsAscribeRaiTotal = append(parsAscribeRaiTotal, noRenewedcompanyIds)
 	if isConfirm != -1 {
 		if isConfirm == 0 {
-			conditionAscribRai += ` AND ( c.company_id NOT IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)  AND  c.product_id = 2 ) ` // 待确认
+			conditionAscribRai += ` AND ( c.company_id NOT IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)  AND  c.product_id = 2  AND  c.end_date >=  '2023-01-01' )  ` // 待确认
 		} else {
-			conditionAscribRai += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)   OR c.product_id = 1 )` // 已确认
+			conditionAscribRai += ` AND ( c.company_id IN (` + utils.GetOrmInReplace(len(noRenewedcompanyIds)) + `)   OR c.product_id = 1  OR   c.end_date <  '2023-01-01' )    ` // 已确认
 		}
 		parsAscribeRai = append(parsAscribeRai, noRenewedcompanyIds)
 	}