|
|
@@ -275,7 +275,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
|
|
|
|
|
|
//新签部分的数据（服务组）
|
|
|
for _, v := range listRaiData {
|
|
|
- if !mapsellerDevelop[v.ShareSellerIdInit] {
|
|
|
+ if !mapsellerService[v.ShareSellerIdInit] {
|
|
|
continue
|
|
|
}
|
|
|
yearStr := getYearStar(utils.StrDateToDate(v.StartDate), dataType)
|
|
|
@@ -973,7 +973,12 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
|
|
|
|
|
|
case "新签合同":
|
|
|
if sellerId != "" {
|
|
|
- condition += ` AND a.seller_id_init IN (` + sellerId + `) `
|
|
|
+ if isServerSeller {
|
|
|
+ condition += ` AND a.share_seller_id_init IN (` + sellerId + `) `
|
|
|
+ } else {
|
|
|
+ condition += ` AND a.seller_id_init IN (` + sellerId + `) `
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
condition += ` AND a.status = 1 AND a.start_date >= ? AND a.start_date <= ? AND a.product_id = 2 `
|
