no message

controllers/cygx/rai_serve.go

@@ -519,9 +519,9 @@ func (this *RaiServeCoAntroller) List() {
 		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)]
+		item.ThisMonthAmount = mapMonthAmount[fmt.Sprint("CID_", v.CompanyId, "MONTH_", 0)]
+		item.LastMonthAmount = mapMonthAmount[fmt.Sprint("CID_", v.CompanyId, "MONTH_", 1)]
+		item.TwoMonthAmount = mapMonthAmount[fmt.Sprint("CID_", v.CompanyId, "MONTH_", 2)]
 		if item.TwoMonthAmount == 0 || item.LastMonthAmount-item.TwoMonthAmount == 0 {
 			item.LastMonthQoq = "0%" //上月环比=（上月服务量-上上月服务量）/上上月服务量，当数值≤-20%时，用红色字显示
 		} else {
@@ -635,6 +635,32 @@ func RaiServeListExport(this *RaiServeCoAntroller, resp *cygx.CygxRaiServeCompan
 	cellF.SetStyle(style)
 	cellF.SetValue("合同金额")
 
+	cellMonth1 := titleRow.AddCell()
+	cellMonth1.SetStyle(style)
+	cellMonth1.SetValue("本月服务量")
+
+	cellMonthQoQ := titleRow.AddCell()
+	cellMonthQoQ.SetStyle(style)
+	cellMonthQoQ.SetValue("上月环比")
+
+	cellMonth2 := titleRow.AddCell()
+	cellMonth2.SetStyle(style)
+	cellMonth2.SetValue("上月服务量")
+
+	cellMonth3 := titleRow.AddCell()
+	cellMonth3.SetStyle(style)
+	cellMonth3.SetValue("上上月服务量")
+
+	for i := 0; i < months; i++ {
+		if i < 3 {
+			continue
+		}
+		// 计算当前周的周一
+		cellMonthi := titleRow.AddCell()
+		cellMonthi.SetStyle(style)
+		cellMonthi.SetValue(mapMonthFormat[i])
+	}
+
 	cellG := titleRow.AddCell()
 	cellG.SetStyle(style)
 	cellG.SetValue("签约套餐")
@@ -665,32 +691,6 @@ func RaiServeListExport(this *RaiServeCoAntroller, resp *cygx.CygxRaiServeCompan
 		cellWei.SetValue(mapWeekFormat[i])
 	}
 
-	cellMonth1 := titleRow.AddCell()
-	cellMonth1.SetStyle(style)
-	cellMonth1.SetValue("本月服务量")
-
-	cellMonthQoQ := titleRow.AddCell()
-	cellMonthQoQ.SetStyle(style)
-	cellMonthQoQ.SetValue("上月环比")
-
-	cellMonth2 := titleRow.AddCell()
-	cellMonth2.SetStyle(style)
-	cellMonth2.SetValue("上月服务量")
-
-	cellMonth3 := titleRow.AddCell()
-	cellMonth3.SetStyle(style)
-	cellMonth3.SetValue("上上月服务量")
-
-	for i := 0; i < months; i++ {
-		if i < 3 {
-			continue
-		}
-		// 计算当前周的周一
-		cellMonthi := titleRow.AddCell()
-		cellMonthi.SetStyle(style)
-		cellMonthi.SetValue(mapMonthFormat[i])
-	}
-
 	for _, v := range resp.List {
 		dataRow := sheel.AddRow()
 		dataRow.SetHeight(20)
@@ -727,16 +727,6 @@ func RaiServeListExport(this *RaiServeCoAntroller, resp *cygx.CygxRaiServeCompan
 		cellFData.SetStyle(style)
 		cellFData.SetValue(v.Money)
 
-		cellGData := dataRow.AddCell()
-		cellGData.SetStyle(style)
-		cellGData.SetValue(v.PermissionName)
-
-		for i := 0; i < weeks; i++ {
-			cellWeiData := dataRow.AddCell()
-			cellWeiData.SetStyle(style)
-			cellWeiData.SetValue(mapWeekAmount[fmt.Sprint("CID_", v.CompanyId, "WEEK_", i)])
-		}
-
 		cellMonth1Data := dataRow.AddCell()
 		cellMonth1Data.SetStyle(style)
 		cellMonth1Data.SetValue(mapMonthAmount[fmt.Sprint("CID_", v.CompanyId, "MONTH_", 0)])
@@ -763,6 +753,16 @@ func RaiServeListExport(this *RaiServeCoAntroller, resp *cygx.CygxRaiServeCompan
 			cellMonthData.SetValue(mapMonthAmount[fmt.Sprint("CID_", v.CompanyId, "MONTH_", i)])
 		}
 
+		cellGData := dataRow.AddCell()
+		cellGData.SetStyle(style)
+		cellGData.SetValue(v.PermissionName)
+
+		for i := 0; i < weeks; i++ {
+			cellWeiData := dataRow.AddCell()
+			cellWeiData.SetStyle(style)
+			cellWeiData.SetValue(mapWeekAmount[fmt.Sprint("CID_", v.CompanyId, "WEEK_", i)])
+		}
+
 	}
 	err = xlsxFile.Save(downLoadnFilePath)
 	if err != nil {
@@ -1075,6 +1075,10 @@ func (this *RaiServeCoAntroller) BillList() {
 				activitySpecialIds = append(activitySpecialIds, v.SourceId)
 			case utils.CYGX_OBJ_RS_CALENDAR:
 				rsCalendarIds = append(rsCalendarIds, v.SourceId)
+			case utils.CYGX_OBJ_ACTIVITYVIDEO:
+				activityIds = append(activityIds, v.ActivityId)
+			case utils.CYGX_OBJ_ACTIVITYVOICE:
+				activityIds = append(activityIds, v.ActivityId)
 			}
 			if v.ServeTypeName == "阅读uv" {
 				v.ServeTypeName = "报告阅读uv" //服务类型名称做一下，映射修改
@@ -1136,7 +1140,26 @@ func (this *RaiServeCoAntroller) BillList() {
 				} else {
 					v.Tag = strings.Join(mapRsCalendarLabel[v.SourceId], ",")
 				}
+			case utils.CYGX_OBJ_ACTIVITYVIDEO:
+				if v.ChartPermissionName == utils.GU_SHOU_NAME || v.ChartPermissionName == utils.CE_LUE_NAME {
+					v.Tag = v.ChartPermissionName
+				} else {
+					v.Tag = strings.Join(mapActivityIndustrialLabel[v.ActivityId], ",")
+					if len(mapActivitySubjectLabel[v.ActivityId]) > 0 {
+						v.Tag += "," + strings.Join(mapActivitySubjectLabel[v.ActivityId], ",")
+					}
+				}
+			case utils.CYGX_OBJ_ACTIVITYVOICE:
+				if v.ChartPermissionName == utils.GU_SHOU_NAME || v.ChartPermissionName == utils.CE_LUE_NAME {
+					v.Tag = v.ChartPermissionName
+				} else {
+					v.Tag = strings.Join(mapActivityIndustrialLabel[v.ActivityId], ",")
+					if len(mapActivitySubjectLabel[v.ActivityId]) > 0 {
+						v.Tag += "," + strings.Join(mapActivitySubjectLabel[v.ActivityId], ",")
+					}
+				}
 			}
+
 		}
 		resp.List = list
 	}

models/cygx/rai_serve_bill.go

@@ -130,6 +130,7 @@ type CygxRaiServeBillResp struct {
 	ViewTime            string  `comment:"浏览时间"`
 	ChartPermissionId   int     `description:"行业id"`
 	ChartPermissionName string  `description:"行业名称"`
+	ActivityId          int     `description:"活动ID"`
 }
 
 type CygxRaiServeBillListResp struct {