|
|
@@ -576,9 +576,10 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
|
|
|
}
|
|
|
for _, v := range tryList {
|
|
|
sysUserId, _ := strconv.Atoi(v.SysUserId)
|
|
|
- if !mapsellerId[sysUserId] {
|
|
|
+ if !mapsellerService[sysUserId] && !mapsellerDevelop[sysUserId] {
|
|
|
continue
|
|
|
}
|
|
|
+
|
|
|
startDateTime := utils.StrTimeToTime(v.CreateTime)
|
|
|
monthNum := startDateTime.Month()
|
|
|
yearStr := strconv.Itoa(startDateTime.Year())
|
|
|
@@ -608,7 +609,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
|
|
|
|
|
|
//var keyMapTtoal string
|
|
|
|
|
|
- if sellerDevelopIds[sysUserId] == true {
|
|
|
+ if mapsellerDevelop[sysUserId] == true {
|
|
|
keyMapTtoal = fmt.Sprint(yearStr, "_Develop")
|
|
|
} else {
|
|
|
keyMapTtoal = fmt.Sprint(yearStr, "_Server_")
|
|
|
@@ -1308,7 +1309,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
|
|
|
condition += ` AND a.seller_id_last IN (` + sellerId + `) `
|
|
|
}
|
|
|
}
|
|
|
- condition += ` AND a.product_id = 2 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.due_end_date >= ? AND a.due_end_date <= ? AND a.due_end_date <= ? `
|
|
|
pars = append(pars, startDate, endDate, time.Now().Format(utils.FormatDate))
|
|
|
|
|
|
total, err := company.GetIncrementalNewCompanyProductMergeCount(condition, pars)
|
