Merge branch 'crm/crm_16.0' of http://8.136.199.33:3000/hongze/hz_crm_api

controllers/statistic/rai_data_summary.go

@@ -184,6 +184,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		mapSignedClientMoney[keyMap] += v.Money
 		mapSignedClientNum[keyMap]++
 	}
+
 	//fmt.Println(time.Now().AddDate(0, 0, -1))
 	//return
 	var sellerDevelop []*system.AdminItem // 开拓组销售
@@ -262,6 +263,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 
 			for _, vS := range sellerService {
 				sellerItem := new(statistic_report.RaiDataSummaryDetail)
+				sellerItem.SellerId = vS.AdminId
 				sellerItem.SellerName = vS.RealName
 				sellerItem.AddTrialCount = "新增试用-(数据)"
 				sellerItem.NewContractData = "新签合同（金额/数量)-(数据)"

models/statistic_report/rai_data_summary.go

@@ -21,6 +21,7 @@ type RaiDataSummaryResp struct {
 }
 
 type RaiDataSummaryDetail struct {
+	SellerId                         int    `description:"销售id"`
 	SellerName                       string `description:"销售名称"`
 	AddTrialCount                    string `description:"新增试用"`
 	NewContractData                  string `description:"新签合同（金额/数量)"`
@@ -93,6 +94,7 @@ func GetRaiDataSummaryList(condition string, pars []interface{}) (items []*Incre
 	o := orm.NewOrm()
 	sql := `SELECT a.start_date,
 			   a.end_date,
+			   a.company_contract_id,
 			   a.money,
 			   a.rai_contract_type,
 			   a.seller_id_init,