Merge branch 'crm/crm_14.2' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/statistic_company_merge.go

@@ -305,7 +305,7 @@ func (this *StatisticCompanyMergerController) MergeCompanyList() {
 		pars1 = append(pars1, startDate, tryOutEndDate)
 		//condition1 += ` AND a.operation = ? `
 		//pars1 = append(pars1, "try_out")
-		//condition1 += ` AND c.status not in ("永续","正式","关闭")  `
+		condition1 += ` AND c.status not in ("永续","正式","关闭")  `
 
 		//未续约已确认数量
 		notRenewalCondition := condition1

controllers/statistic_report.go

@@ -3719,7 +3719,7 @@ func (this *StatisticReportController) IncrementalCompanyList() {
 		notRenewalPars := pars1
 		notRenewalCondition += conditionAscribRaiTotal
 		notRenewalPars = append(notRenewalPars, parsAscribeRaiTotal)
-		total, err := models.GetIncrementalCompanyCountByOperationRecord(notRenewalCondition, notRenewalPars)
+		total, err := models.GetIncrementalCompanyProductCountByOperationRecord(notRenewalCondition, notRenewalPars)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "获取失败"
 			br.ErrMsg = "获取失败，Err:" + err.Error()