no message

controllers/cygx/rai_serve.go

@@ -443,6 +443,7 @@ func (this *RaiServeCoAntroller) List() {
 
 	mapWeekAmount := make(map[string]float64) //周度服务量
 	weeks := 4
+	months := 3
 	if isExport {
 		weeks = 12 // 下载获取近12周的数据
 	}
@@ -482,7 +483,15 @@ func (this *RaiServeCoAntroller) List() {
 				monday := now.AddDate(0, 0, -int(now.Weekday()-time.Monday)-i*7)
 				weekmonday := monday.Format(utils.FormatDate)
 				if v.WeekStartDate == weekmonday {
-					mapWeekAmount[fmt.Sprintf("CID_", v.CompanyId, "WEEK_", i)] += v.ServeCount
+					mapWeekAmount[fmt.Sprint("CID_", v.CompanyId, "WEEK_", i)] += v.ServeCount
+				}
+			}
+			for i := 0; i < months; i++ {
+				// 计算当前月的第一天
+				monthday := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location()).AddDate(0, i, 0)
+				monthFirstDay := monthday.Format(utils.FormatDate)
+				if v.MonthStartDate == monthFirstDay {
+					mapWeekAmount[fmt.Sprint("CID_", v.CompanyId, "MONTH_", i)] += v.ServeCount
 				}
 			}
 		}
@@ -504,10 +513,23 @@ func (this *RaiServeCoAntroller) List() {
 		item.Status = v.Status
 		item.PermissionName = v.PermissionName
 		item.IsUserMaker = v.IsUserMaker
-		item.ThisWeekAmount = mapWeekAmount[fmt.Sprintf("CID_", v.CompanyId, "WEEK_", 0)]
-		item.LastWeekAmount = mapWeekAmount[fmt.Sprintf("CID_", v.CompanyId, "WEEK_", 1)]
-		item.TwoWeekAmount = mapWeekAmount[fmt.Sprintf("CID_", v.CompanyId, "WEEK_", 2)]
-		item.ThreeWeekAmount = mapWeekAmount[fmt.Sprintf("CID_", v.CompanyId, "WEEK_", 3)]
+		item.ThisWeekAmount = mapWeekAmount[fmt.Sprint("CID_", v.CompanyId, "WEEK_", 0)]
+		item.LastWeekAmount = mapWeekAmount[fmt.Sprint("CID_", v.CompanyId, "WEEK_", 1)]
+		item.TwoWeekAmount = mapWeekAmount[fmt.Sprint("CID_", v.CompanyId, "WEEK_", 2)]
+		item.ThreeWeekAmount = mapWeekAmount[fmt.Sprint("CID_", v.CompanyId, "WEEK_", 3)]
+
+		item.ThisMonthAmount = mapWeekAmount[fmt.Sprint("CID_", v.CompanyId, "MONTH_", 0)]
+		item.LastMonthAmount = mapWeekAmount[fmt.Sprint("CID_", v.CompanyId, "MONTH_", 1)]
+		item.TwoMonthAmount = mapWeekAmount[fmt.Sprint("CID_", v.CompanyId, "MONTH_", 2)]
+		if item.TwoMonthAmount == 0 || item.LastMonthAmount-item.TwoMonthAmount == 0 {
+			item.LastMonthQoq = "0%" //上月环比=（上月服务量-上上月服务量）/上上月服务量，当数值≤-20%时，用红色字显示
+		} else {
+			item.LastMonthQoq = fmt.Sprint(utils.SubFloatToString((item.LastMonthAmount-item.TwoMonthAmount)/item.TwoMonthAmount*100, 2)) + "%"
+			if (item.LastMonthAmount-item.TwoMonthAmount)/item.TwoMonthAmount <= 0.2 {
+				item.LastMonthQoqIsRed = true
+			}
+		}
+
 		resp.List = append(resp.List, item)
 	}
 
@@ -889,6 +911,7 @@ func (this *RaiServeCoAntroller) CoverageRate() {
 // @Param   TagId   query   int  false       "标签ID"
 // @Param   ServeTypeId   int   int	  false       "服务类型ID"
 // @Param   WhatWeek   query   int  false       "哪一周 ，1:本周、2：上周、3：上上周、4上三周"
+// @Param   WhatMonth   query   int  false       "哪一月 ，1:本月、2：上月、3：上上月"
 // @Success 200 {object} cygx.RaiServeTagListResp
 // @router /rai_serve/bill_list [get]
 func (this *RaiServeCoAntroller) BillList() {
@@ -911,6 +934,7 @@ func (this *RaiServeCoAntroller) BillList() {
 	tagId, _ := this.GetInt("TagId")
 	serveTypeId, _ := this.GetInt("ServeTypeId")
 	whatWeek, _ := this.GetInt("WhatWeek")
+	whatMonth, _ := this.GetInt("WhatMonth")
 
 	var startSize int
 	if pageSize <= 0 {
@@ -943,6 +967,14 @@ func (this *RaiServeCoAntroller) BillList() {
 		pars = append(pars, monday.Format(utils.FormatDate))
 	}
 
+	if whatMonth > 0 {
+		now := time.Now()
+		// 计算所选月份的第一天
+		monthday := time.Date(now.Year(), now.Month(), 1, 0, 0, 0, 0, now.Location()).AddDate(0, whatWeek, 0)
+		condition += " AND  month_start_date = ? "
+		pars = append(pars, monthday.Format(utils.FormatDate))
+	}
+
 	condition += " AND  company_id = ? "
 	pars = append(pars, companyId)
 	if serveTypeId > 0 {

models/cygx/rai_serve_bill.go

@@ -178,6 +178,8 @@ type CygxRaiServeBill struct {
 	Source           string    `comment:"来源 "`
 	WeekStartDate    string    `comment:"周一开始日期"`
 	WeekEndDate      string    `comment:"周日结束日期"`
+	MonthStartDate   string    `comment:"月份开始日期"`
+	MonthEndDate     string    `comment:"月份结束日期"`
 	CreateTime       time.Time `comment:"创建时间"`
 	ViewTime         string    `comment:"浏览时间"`
 }

models/cygx/rai_serve_company.go

@@ -42,6 +42,11 @@ type CygxRaiServeCompanyResp struct {
 	LastWeekAmount    float64 `comment:"上周互动量"`
 	TwoWeekAmount     float64 `comment:"上上周互动量"`
 	ThreeWeekAmount   float64 `comment:"上三周互动量"`
+	ThisMonthAmount   float64 `comment:"本月互动量"`
+	LastMonthAmount   float64 `comment:"上月互动量"`
+	LastMonthQoq      string  `comment:"上月环比"`
+	LastMonthQoqIsRed bool    `comment:"上月环比"`
+	TwoMonthAmount    float64 `comment:"上上月互动量"`
 }
 
 type CygxRaiServeCompanyListResp struct {