Merge branch 'crm/crm_16.7' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/statistic/rai_data_summary.go

@@ -126,7 +126,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 	//续约部分的数据
 	var conditionInherit string
 	var parsInherit []interface{}
-	conditionInherit = " AND  a.product_id = 2  AND  a.status = 1  AND  a.inherit_end_date >= ?  AND  a.inherit_end_date <= ? "
+	conditionInherit = " AND  a.product_id = 2  AND  a.status = 1  AND  a.inherit_end_date >= ?  AND  a.inherit_end_date <= ?  AND a.rai_contract_type = '续约合同'  "
 	parsInherit = append(parsInherit, startDate, endDate)
 	listInheritData, err := statistic_report.GetRaiDataSummaryInheritList(conditionInherit, parsInherit)
 	if err != nil {
@@ -948,7 +948,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 			condition += ` AND a.seller_id_last  IN (` + sellerId + `) `
 		}
 
-		condition += ` AND  a.status = 1  AND a.inherit_end_date >= ?  AND a.inherit_end_date <= ?  AND  a.inherit_company_contract_id > 0  `
+		condition += ` AND  a.status = 1  AND a.inherit_end_date >= ?  AND a.inherit_end_date <= ?  AND  a.inherit_company_contract_id > 0  AND a.rai_contract_type = '续约合同'   `
 		pars = append(pars, startDate, endDate)
 
 		total, err := company.GetIncrementalNewCompanyProductMergeCount(condition, pars)
@@ -1223,7 +1223,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 
 			conditionInherit += ` AND a.seller_id_last  IN (` + sellerId + `) `
 		}
-		condition += " AND  a.product_id = 2  AND  a.status = 1  AND  a.start_date >= ?  AND  a.start_date <= ? "
+		condition += " AND  a.product_id = 2  AND  a.status = 1  AND  a.start_date >= ?  AND  a.start_date <= ?  AND a.rai_contract_type = '新签合同' "
 		pars = append(pars, startDate, endDate)
 		listRaiData, err := statistic_report.GetRaiDataSummaryList(condition, pars)
 		if err != nil {
@@ -1233,7 +1233,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		}
 
 		//续约部分的数据
-		conditionInherit += " AND  a.product_id = 2  AND  a.status = 1  AND  a.inherit_end_date >= ?  AND  a.inherit_end_date <= ? AND  a.inherit_company_contract_id > 0 "
+		conditionInherit += " AND  a.product_id = 2  AND  a.status = 1  AND  a.inherit_end_date >= ?  AND  a.inherit_end_date <= ? AND  a.inherit_company_contract_id > 0  AND a.rai_contract_type = '续约合同' "
 		parsInherit = append(parsInherit, startDate, endDate)
 		listInheritData, err := statistic_report.GetRaiDataSummaryInheritList(conditionInherit, parsInherit)
 		if err != nil {