no message

controllers/statistic/rai_data_summary.go

@@ -307,10 +307,10 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		if len(adminIdArr) > 0 && !utils.InArrayByStr(adminIdArr, strconv.Itoa(v.SellerIdLast)) {
 			continue
 		}
-		if !mapsellerDevelop[v.SellerIdInit] {
+		if !mapsellerDevelop[v.SellerIdLast] {
 			continue
 		}
-		yearStr := getYearStar(utils.StrDateToDate(v.StartDate), dataType)
+		yearStr := getYearStar(utils.StrDateToDate(v.InheritEndDate), dataType)
 
 		keyMap = fmt.Sprint(yearStr, "_", v.SellerIdLast)
 		keyMapCompany = fmt.Sprint(yearStr, "_", v.SellerIdLast, "_CID_", v.CompanyId)
@@ -349,7 +349,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		if !mapsellerService[v.ShareSellerIdLast] {
 			continue
 		}
-		yearStr := getYearStar(utils.StrDateToDate(v.StartDate), dataType)
+		yearStr := getYearStar(utils.StrDateToDate(v.InheritEndDate), dataType)
 
 		keyMap = fmt.Sprint(yearStr, "_Server_", v.ShareSellerIdLast)
 		keyMapCompany = fmt.Sprint(yearStr, "_Server_", v.ShareSellerIdLast, "_CID_", v.CompanyId)
@@ -383,15 +383,15 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 	//确认不续约、到期合同部分的数据
 	mapKeyMapCompanyEndData := make(map[string]bool)
 	mapKeyMapCompanyNoData := make(map[string]bool)
-	//开拓组数据
+	//到期部分开拓组数据
 	for _, v := range listEndData {
 		if len(adminIdArr) > 0 && !utils.InArrayByStr(adminIdArr, strconv.Itoa(v.SellerIdLast)) {
 			continue
 		}
-		if !mapsellerDevelop[v.SellerIdInit] {
+		if !mapsellerDevelop[v.SellerIdLast] {
 			continue
 		}
-		yearStr := getYearStar(utils.StrDateToDate(v.StartDate), dataType)
+		yearStr := getYearStar(utils.StrDateToDate(v.EndDate), dataType)
 
 		keyMap = fmt.Sprint(yearStr, "_", v.SellerIdLast)
 		keyMapCompany = fmt.Sprint(yearStr, "_", v.SellerIdLast, "_CID_", v.CompanyId)
@@ -429,7 +429,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		}
 	}
 
-	//服务组数据
+	//到期部分服务组数据
 	for _, v := range listEndData {
 		if len(serviceAdminIdArr) > 0 && !utils.InArrayByStr(serviceAdminIdArr, strconv.Itoa(v.ShareSellerIdLast)) {
 			continue
@@ -437,7 +437,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		if !mapsellerService[v.ShareSellerIdLast] {
 			continue
 		}
-		yearStr := getYearStar(utils.StrDateToDate(v.StartDate), dataType)
+		yearStr := getYearStar(utils.StrDateToDate(v.EndDate), dataType)
 
 		keyMap = fmt.Sprint(yearStr, "_Server_", v.ShareSellerIdLast)
 		keyMapCompany = fmt.Sprint(yearStr, "_Server_", v.ShareSellerIdLast, "_CID_", v.CompanyId)
@@ -1039,7 +1039,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 
 		}
 
-		condition += ` AND  a.status = 1  AND a.end_date >= ?  AND a.end_date <= ?   AND a.end_date < ? `
+		condition += ` 	AND a.product_id = 2  AND  a.status = 1  AND a.end_date >= ?  AND a.end_date <= ?   AND a.end_date < ? `
 		pars = append(pars, startDate, endDate, time.Now().Format(utils.FormatDate))
 
 		total, err := company.GetIncrementalNewCompanyProductMergeCount(condition, pars)