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

@@ -535,7 +535,9 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 				}
 				sellerItem.NewCustomerInvoicingCount = utils.SubFloatToString(mapNewCustomerInvoicingMoney[keyMap], 2)               // "新客开票-(数据)"
 				sellerItem.NewCustomerPaymentsReceivedCount = utils.SubFloatToString(mapNewCustomerPaymentsReceivedMoney[keyMap], 2) // "新客到款-(数据)"
-				item.DataList = append(item.DataList, sellerItem)
+				if developButton || serverButton {
+					item.DataList = append(item.DataList, sellerItem)
+				}
 			}
 
 			if len(sellerDevelop) > 0 {
@@ -648,7 +650,9 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 				}
 				sellerItem.NewCustomerInvoicingCount = utils.SubFloatToString(mapNewCustomerInvoicingMoney[keyMap], 2)               // "新客开票-(数据)"
 				sellerItem.NewCustomerPaymentsReceivedCount = utils.SubFloatToString(mapNewCustomerPaymentsReceivedMoney[keyMap], 2) // "新客到款-(数据)"
-				item.DataList = append(item.DataList, sellerItem)
+				if developButton || serverButton {
+					item.DataList = append(item.DataList, sellerItem)
+				}
 			}
 			if len(sellerService) > 0 {
 				sellerItem := new(statistic_report.RaiDataSummaryDetail)
@@ -889,7 +893,6 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 
 		if sellerId != "" {
 			condition += ` AND a.seller_id_last  IN (` + sellerId + `) `
-			pars = append(pars, sellerId)
 		}
 
 		condition += ` AND  a.status = 1  AND a.end_date >= ?  AND a.end_date <= ?   AND a.end_date < ? `
@@ -943,7 +946,6 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 	case "续约合同":
 		if sellerId != "" {
 			condition += ` AND a.seller_id_last  IN (` + sellerId + `) `
-			pars = append(pars, sellerId)
 		}
 
 		condition += ` AND  a.status = 1  AND a.inherit_end_date >= ?  AND a.inherit_end_date <= ?  AND  a.inherit_company_contract_id > 0  `
@@ -1142,10 +1144,8 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 		var parsEnd []interface{}
 		if sellerId != "" {
 			condition += ` AND a.seller_id_last  IN (` + sellerId + `) `
-			pars = append(pars, sellerId)
 
 			conditionEnd += ` AND a.seller_id_last  IN (` + sellerId + `) `
-			parsEnd = append(parsEnd, sellerId)
 		}
 
 		condition += ` AND  a.product_id = 2  AND  a.status = 1  AND  a.end_date >= ?  AND  a.end_date <= ? AND a.end_date <= ?  `
@@ -1285,7 +1285,6 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 	case "客单价":
 		if sellerId != "" {
 			condition += ` AND a.seller_id_last  IN (` + sellerId + `) `
-			pars = append(pars, sellerId)
 		}
 		condition += " AND  a.product_id = 2  AND  a.status = 1  AND  a.start_date >= ?  AND  a.start_date <= ? "
 		pars = append(pars, startDate, endDate)
@@ -1315,7 +1314,6 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 	case "开票金额":
 		if sellerId != "" {
 			condition += ` AND a.rai_seller_id  IN (` + sellerId + `) `
-			pars = append(pars, sellerId)
 		}
 		condition += " AND  a.is_deleted = 0    AND  a.start_date >= ?  AND  a.start_date <= ?  AND  invoiced_amount > 0   AND product_ids LIKE '%2%' "
 		pars = append(pars, startDate, endDate)
@@ -1361,7 +1359,6 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 	case "到款金额":
 		if sellerId != "" {
 			condition += ` AND a.rai_seller_id  IN (` + sellerId + `) `
-			pars = append(pars, sellerId)
 		}
 		condition += " AND  a.is_deleted = 0    AND  a.start_date >= ?  AND  a.start_date <= ?  AND  payment_amount > 0   AND product_ids LIKE '%2%' "
 		pars = append(pars, startDate, endDate)
@@ -1408,7 +1405,6 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 	case "未到款比例":
 		if sellerId != "" {
 			condition += ` AND a.rai_seller_id  IN (` + sellerId + `) `
-			pars = append(pars, sellerId)
 		}
 		condition += " AND  a.is_deleted = 0   AND  a.start_date >= ?  AND  a.start_date <= ?    AND product_ids LIKE '%2%' "
 		pars = append(pars, startDate, endDate)
@@ -1431,7 +1427,6 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 	case "新客开票":
 		if sellerId != "" {
 			condition += ` AND a.rai_seller_id  IN (` + sellerId + `) `
-			pars = append(pars, sellerId)
 		}
 		condition += " AND  a.is_deleted = 0  AND contract_type = 1   AND  a.start_date >= ?  AND  a.start_date <= ?   AND product_ids LIKE '%2%' "
 		pars = append(pars, startDate, endDate)
@@ -1477,7 +1472,6 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 	case "新客到款":
 		if sellerId != "" {
 			condition += ` AND a.rai_seller_id  IN (` + sellerId + `) `
-			pars = append(pars, sellerId)
 		}
 		condition += " AND  a.is_deleted = 0    AND contract_type = 1   AND  a.start_date >= ?  AND  a.start_date <= ?  AND  payment_amount > 0   AND product_ids LIKE '%2%' "
 		pars = append(pars, startDate, endDate)