no message

controllers/statistic/rai_data_summary.go

@@ -34,6 +34,8 @@ type StatisticRaiDataSummaryController struct {
 // @Param   DevelopButton   query   int	  false       "开拓组开关，枚举值：1:开启，0：关闭 ，默认关闭"
 // @Param   ServerButton   query   int	  false       "服务组开关，枚举值：1:开启，0：关闭 ，默认关闭"
 // @Param   ContractButtonType   query   string	  false       "开关类型，：`新签`，`续约`，`收入` 多个用英文逗号隔开， "
+// @Param   StartDate   query   string	  false       "开始时间 "
+// @Param   EndDate   query   string	  false       "结束时间 "
 // @Param   IsExport   query   bool  false       "是否导出excel，默认是false"
 // @Success 200 {object} statistic_report.RaiDataSummaryListResp
 // @router /rai_data_summary/list [get]
@@ -59,6 +61,8 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 	endYear, _ := this.GetInt("EndYear")
 	developButton, _ := this.GetBool("DevelopButton")
 	serverButton, _ := this.GetBool("ServerButton")
+	startDate := this.GetString("StartDate")
+	endDate := this.GetString("EndDate")
 
 	adminIdArr := strings.Split(adminId, ",")
 	serviceAdminIdArr := strings.Split(serviceAdminId, ",")
@@ -143,9 +147,16 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		mapsellerId[v.AdminId] = true
 	}
 
+	var isCustomizeDate bool // 是否有自定义的时间
 	//拼接起始时间查询
-	startDate := fmt.Sprintf("%d-01-01", startYear)
-	endDate := fmt.Sprintf("%d-12-31", endYear)
+	if startDate == "" {
+		startDate = fmt.Sprintf("%d-01-01", startYear)
+		endDate = fmt.Sprintf("%d-12-31", endYear)
+	} else {
+		isCustomizeDate = true
+		startYear = 1
+		endYear = 1
+	}
 
 	//新签部分的数据
 	var conditionRai string
@@ -250,7 +261,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		if !mapsellerDevelop[v.SellerIdInit] {
 			continue
 		}
-		yearStr := getYearStar(utils.StrDateToDate(v.StartDate), dataType)
+		yearStr := getYearStar(utils.StrDateToDate(v.StartDate), dataType, isCustomizeDate)
 
 		keyMap = fmt.Sprint(yearStr, "_", v.SellerIdInit)
 		keySigned = fmt.Sprint(yearStr, "_CID_", v.CompanyId, "_SID_", v.SellerIdInit)
@@ -278,7 +289,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		if !mapsellerService[v.ShareSellerIdInit] {
 			continue
 		}
-		yearStr := getYearStar(utils.StrDateToDate(v.StartDate), dataType)
+		yearStr := getYearStar(utils.StrDateToDate(v.StartDate), dataType, isCustomizeDate)
 
 		keyMap = fmt.Sprint(yearStr, "_Server_", v.ShareSellerIdInit)
 		keySigned = fmt.Sprint(yearStr, "_Server_", v.CompanyId, "_SID_", v.ShareSellerIdInit)
@@ -310,7 +321,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		if !mapsellerDevelop[v.SellerIdLast] {
 			continue
 		}
-		yearStr := getYearStar(utils.StrDateToDate(v.InheritEndDate), dataType)
+		yearStr := getYearStar(utils.StrDateToDate(v.InheritEndDate), dataType, isCustomizeDate)
 
 		keyMap = fmt.Sprint(yearStr, "_", v.SellerIdLast)
 		keyMapCompany = fmt.Sprint(yearStr, "_", v.SellerIdLast, "_CID_", v.CompanyId)
@@ -349,7 +360,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		if !mapsellerService[v.ShareSellerIdLast] {
 			continue
 		}
-		yearStr := getYearStar(utils.StrDateToDate(v.InheritEndDate), dataType)
+		yearStr := getYearStar(utils.StrDateToDate(v.InheritEndDate), dataType, isCustomizeDate)
 
 		keyMap = fmt.Sprint(yearStr, "_Server_", v.ShareSellerIdLast)
 		keyMapCompany = fmt.Sprint(yearStr, "_Server_", v.ShareSellerIdLast, "_CID_", v.CompanyId)
@@ -391,7 +402,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		if !mapsellerDevelop[v.SellerIdLast] {
 			continue
 		}
-		yearStr := getYearStar(utils.StrDateToDate(v.EndDate), dataType)
+		yearStr := getYearStar(utils.StrDateToDate(v.EndDate), dataType, isCustomizeDate)
 
 		keyMap = fmt.Sprint(yearStr, "_", v.SellerIdLast)
 		keyMapCompany = fmt.Sprint(yearStr, "_", v.SellerIdLast, "_CID_", v.CompanyId)
@@ -437,7 +448,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		if !mapsellerService[v.ShareSellerIdLast] {
 			continue
 		}
-		yearStr := getYearStar(utils.StrDateToDate(v.EndDate), dataType)
+		yearStr := getYearStar(utils.StrDateToDate(v.EndDate), dataType, isCustomizeDate)
 
 		keyMap = fmt.Sprint(yearStr, "_Server_", v.ShareSellerIdLast)
 		keyMapCompany = fmt.Sprint(yearStr, "_Server_", v.ShareSellerIdLast, "_CID_", v.CompanyId)
@@ -488,7 +499,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		if !mapsellerDevelop[v.RaiSellerId] {
 			continue
 		}
-		yearStr := getYearStar(utils.StrDateToDate(v.InvoiceTime), dataType)
+		yearStr := getYearStar(utils.StrDateToDate(v.InvoiceTime), dataType, isCustomizeDate)
 
 		keyMap = fmt.Sprint(yearStr, "_", v.RaiSellerId)
 		keyMapTtoal = fmt.Sprint(yearStr, "_Develop")
@@ -522,7 +533,7 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 		if !mapsellerService[v.RaiSellerId] {
 			continue
 		}
-		yearStr := getYearStar(utils.StrDateToDate(v.InvoiceTime), dataType)
+		yearStr := getYearStar(utils.StrDateToDate(v.InvoiceTime), dataType, isCustomizeDate)
 
 		keyMap = fmt.Sprint(yearStr, "_Server_", v.RaiSellerId)
 		keyMapTtoal = fmt.Sprint(yearStr, "_Server_")
@@ -579,6 +590,10 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 				yearStr += "H2"
 			}
 		}
+		if isCustomizeDate {
+			yearStr = ""
+		}
+
 		keyMap = fmt.Sprint(yearStr, "_", v.SysUserId)
 		mapAddTrialNum[keyMap]++
 
@@ -598,7 +613,11 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 	for i := startYear; i <= endYear; i++ {
 		for _, Dv := range dataTypeArr {
 			item := new(statistic_report.RaiDataSummaryResp)
-			item.DataType = fmt.Sprint(i, Dv)
+			if isCustomizeDate {
+				item.DataType = "" //传了自定义时间之后，把key值，置空
+			} else {
+				item.DataType = fmt.Sprint(i, Dv)
+			}
 			keyMapTtoal = fmt.Sprint(item.DataType, "_Develop")
 			keyMapTtoalServer = fmt.Sprint(item.DataType, "_Server_")
 			for _, vS := range sellerDevelop {
@@ -850,6 +869,8 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryList() {
 // @Param   DataType   query   string  false       "报表类型，枚举值：`季度`，`年度`，`半年度`"
 // @Param   PopupType   query   string	  false       "弹窗数据类型，枚举值："
 // @Param   IsServerSeller   query   bool	  false       "是否属于服务组销售"
+// @Param   StartDate   query   string	  false       "开始时间 "
+// @Param   EndDate   query   string	  false       "结束时间 "
 // @Param   PageSize   query   int  true       "每页数据条数"
 // @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
 // @Success 200 {object} statistic_report.RaiDataSummaryPopupTypeResp
@@ -874,6 +895,8 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 	sellerId := this.GetString("SellerId")
 	popupType := this.GetString("PopupType")
 	isServerSeller, _ := this.GetBool("IsServerSeller")
+	startDate := this.GetString("StartDate")
+	endDate := this.GetString("EndDate")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -884,30 +907,32 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 	}
 	startSize = utils.StartIndex(currentIndex, pageSize)
 
-	var startDate string
-	var endDate string
-	year := (dataType[:4])
-	if strings.Contains(dataType, "Q1") {
-		startDate = year + "-01-01"
-		endDate = year + "-03-31"
-	} else if strings.Contains(dataType, "Q2") {
-		startDate = year + "-04-01"
-		endDate = year + "-06-30"
-	} else if strings.Contains(dataType, "Q3") {
-		startDate = year + "-07-01"
-		endDate = year + "-09-30"
-	} else if strings.Contains(dataType, "Q4") {
-		startDate = year + "-10-01"
-		endDate = year + "-12-31"
-	} else if strings.Contains(dataType, "H1") {
-		startDate = year + "-01-01"
-		endDate = year + "-06-31"
-	} else if strings.Contains(dataType, "H2") {
-		startDate = year + "-07-01"
-		endDate = year + "-12-31"
-	} else {
-		startDate = year + "-01-01"
-		endDate = year + "-12-31"
+	//var startDate string
+	//var endDate string
+	if startDate == "" {
+		year := (dataType[:4])
+		if strings.Contains(dataType, "Q1") {
+			startDate = year + "-01-01"
+			endDate = year + "-03-31"
+		} else if strings.Contains(dataType, "Q2") {
+			startDate = year + "-04-01"
+			endDate = year + "-06-30"
+		} else if strings.Contains(dataType, "Q3") {
+			startDate = year + "-07-01"
+			endDate = year + "-09-30"
+		} else if strings.Contains(dataType, "Q4") {
+			startDate = year + "-10-01"
+			endDate = year + "-12-31"
+		} else if strings.Contains(dataType, "H1") {
+			startDate = year + "-01-01"
+			endDate = year + "-06-31"
+		} else if strings.Contains(dataType, "H2") {
+			startDate = year + "-07-01"
+			endDate = year + "-12-31"
+		} else {
+			startDate = year + "-01-01"
+			endDate = year + "-12-31"
+		}
 	}
 
 	resp := new(statistic_report.RaiDataSummaryPopupTypeResp)
@@ -1724,7 +1749,10 @@ func (this *StatisticRaiDataSummaryController) RaiDataSummaryDetail() {
 }
 
 // 时间筛选项的转换
-func getYearStar(startDate time.Time, dataType string) (yearStr string) {
+func getYearStar(startDate time.Time, dataType string, isCustomizeDate bool) (yearStr string) {
+	if isCustomizeDate {
+		return //如果有自定的时间，就传空值
+	}
 	startDateTime := startDate
 	monthNum := startDateTime.Month()
 	yearStr = strconv.Itoa(startDateTime.Year())