|
|
@@ -222,7 +222,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
|
|
|
} else {
|
|
|
condition1, pars1 = getQueryParams(condition1, pars1, sysUser, "c.")
|
|
|
}
|
|
|
- condition1 += ` AND a.create_time >= ? AND a.create_time <= ? AND a.operation in ("add","receive") AND b.company_id NOT IN ( SELECT company_id FROM company_operation_record WHERE product_id = 2 AND operation ="loss" GROUP BY company_id ) `
|
|
|
+ condition1 += ` AND a.create_time >= ? AND a.create_time <= ? AND a.operation in ("add","receive") AND b.company_id NOT IN ( SELECT company_id FROM company_operation_record WHERE product_id = 2 AND operation ="loss" GROUP BY company_id ) AND c.status = '试用' `
|
|
|
pars1 = append(pars1, startDate, endDate)
|
|
|
|
|
|
total, err := models.GetIncrementalCompanyCountByOperationRecord(condition1, pars1)
|
