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

@@ -478,10 +478,13 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 			item.DataType = fmt.Sprint(i, Dv)
 			keyMapTtoal = fmt.Sprint(item.DataType, "_Develop")
 			keyMapTtoalServer = fmt.Sprint(item.DataType, "_Server")
+			var sellerIds []string
+			var sellerServiceIds []string
 			for _, vS := range sellerDevelop {
 				keyMap = fmt.Sprint(item.DataType, "_", vS.AdminId)
 				sellerItem := new(statistic_report.RaiDataSummaryDetail)
-				sellerItem.SellerId = vS.AdminId
+				sellerItem.SellerId = strconv.Itoa(vS.AdminId)
+				sellerIds = append(sellerIds, sellerItem.SellerId)
 				sellerItem.SellerName = vS.RealName
 				sellerItem.AddTrialCount = fmt.Sprint(mapAddTrialNum[keyMap])
 				sellerItem.NewContractData = fmt.Sprint(utils.SubFloatToString(mapNewContractMoney[keyMap], 2), " / ", mapNewContractNum[keyMap])             // 新签合同（金额/数量)-(数据)
@@ -537,6 +540,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 
 			if len(sellerDevelop) > 0 {
 				sellerItem := new(statistic_report.RaiDataSummaryDetail)
+				sellerItem.SellerId = strings.Join(sellerIds, ",")
 				sellerItem.SellerName = "开拓组合计"
 				sellerItem.AddTrialCount = fmt.Sprint(mapAddTrialNum[keyMapTtoal])
 				sellerItem.NewContractData = fmt.Sprint(utils.SubFloatToString(mapNewContractMoney[keyMapTtoal], 2), " / ", mapNewContractNum[keyMapTtoal])             // 新签合同（金额/数量)-(数据)
@@ -592,7 +596,8 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 
 			for _, vS := range sellerService {
 				sellerItem := new(statistic_report.RaiDataSummaryDetail)
-				sellerItem.SellerId = vS.AdminId
+				sellerItem.SellerId = strconv.Itoa(vS.AdminId)
+				sellerServiceIds = append(sellerServiceIds, sellerItem.SellerId)
 				sellerItem.SellerName = vS.RealName
 				sellerItem.AddTrialCount = fmt.Sprint(mapAddTrialNum[keyMap])
 				sellerItem.NewContractData = fmt.Sprint(utils.SubFloatToString(mapNewContractMoney[keyMap], 2), " / ", mapNewContractNum[keyMap])             // 新签合同（金额/数量)-(数据)
@@ -647,6 +652,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 			}
 			if len(sellerService) > 0 {
 				sellerItem := new(statistic_report.RaiDataSummaryDetail)
+				sellerItem.SellerId = strings.Join(sellerServiceIds, ",")
 				sellerItem.SellerName = "服务组合计"
 				sellerItem.AddTrialCount = fmt.Sprint(mapAddTrialNum[keyMapTtoalServer])
 				sellerItem.NewContractData = fmt.Sprint(utils.SubFloatToString(mapNewContractMoney[keyMapTtoalServer], 2), " / ", mapNewContractNum[keyMapTtoalServer])             // 新签合同（金额/数量)-(数据)
@@ -1434,7 +1440,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 			condition += ` AND a.rai_seller_id = ? `
 			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%' "
+		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)
 		listFmsData, err := fms.GetContractRegisterList(condition, pars, startSize, pageSize)
 		if err != nil {

models/statistic_report/rai_data_summary.go

@@ -22,7 +22,7 @@ type RaiDataSummaryResp struct {
 }
 
 type RaiDataSummaryDetail struct {
-	SellerId                         int    `description:"销售id"`
+	SellerId                         string `description:"销售id"`
 	SellerName                       string `description:"销售名称"`
 	AddTrialCount                    string `description:"新增试用"`
 	NewContractData                  string `description:"新签合同（金额/数量)"`