|
@@ -360,7 +360,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
|
|
|
condition1 += condition
|
|
condition1 += condition
|
|
|
pars1 = append(pars1, pars)
|
|
pars1 = append(pars1, pars)
|
|
|
|
|
|
|
|
- condition1 += ` AND a.status = 1 AND a.start_date >= '2020-01-01' AND a.end_date >= ? AND a.end_date <= ? `
|
|
|
|
|
|
|
+ condition1 += ` AND a.not_renewal_hide = 0 AND a.status = 1 AND a.start_date >= '2020-01-01' AND a.end_date >= ? AND a.end_date <= ? `
|
|
|
pars1 = append(pars1, startDate, endDate)
|
|
pars1 = append(pars1, startDate, endDate)
|
|
|
//condition1 += ` AND a.operation = ? `
|
|
//condition1 += ` AND a.operation = ? `
|
|
|
//pars1 = append(pars1, "try_out")
|
|
//pars1 = append(pars1, "try_out")
|
