Merge branch 'cygx_8.7' into debug

controllers/activity.go

@@ -4649,7 +4649,7 @@ func (this *ActivityCoAntroller) ActivityListSearch() {
 // @Title 已结束的活动
 // @Description 获取已结束的活动接口
 // @Param   ChartPermissionIds   query   string  false     "行业id 多个用 , 隔开"
-// @Param   WhichDay   query   string  false       "哪一天 1本周、2上周，3本月，4上月 可多选"
+// @Param   WhichDay   query   string  false       "哪一天 3本周、4上周，5本月，6上月 可多选"
 // @Param   IsPower   query   string  false       "是否选择有权限行业 ，1是 0 否 默认0"
 // @Param   TypeName   query   string  false       "电话会类型 ，1专家电话会 2分析师电话会"
 // @Success 200 {object} models.GetCygxActivityLabelListRep
@@ -4783,22 +4783,22 @@ func (this *ActivityCoAntroller) OverActivityList() {
 	if whichDay != "" {
 		var startDate string
 		var endDate string
-		if whichDay == "1" {
+		if whichDay == "3" {
 			startDate = utils.GetNowWeekMonday().Format(utils.FormatDate)
 			endDate = utils.GetNowWeekSunday().Format(utils.FormatDate)
-		} else if whichDay == "2" {
+		} else if whichDay == "4" {
 			startDate = utils.GetLastWeekMonday().Format(utils.FormatDate)
 			endDate = utils.GetLastWeekSunday().Format(utils.FormatDate)
-		}  else if whichDay == "3" {
+		}  else if whichDay == "5" {
 			startDate = utils.GetNowMonthFirstDay().Format(utils.FormatDate)
 			endDate = utils.GetNowMonthLastDay().Format(utils.FormatDate)
-		} else if whichDay == "4" {
+		} else if whichDay == "6" {
 			startDate = utils.GetLastMonthFirstDay().Format(utils.FormatDate)
 			endDate = utils.GetLastMonthLastDay().Format(utils.FormatDate)
-		} else if whichDay == "1,2" {
+		} else if whichDay == "3,4" {
 			startDate = utils.GetLastWeekMonday().Format(utils.FormatDate)
 			endDate = utils.GetNowWeekSunday().Format(utils.FormatDate)
-		} else if whichDay == "3,4" {
+		} else if whichDay == "5,6" {
 			startDate = utils.GetLastMonthFirstDay().Format(utils.FormatDate)
 			endDate = utils.GetNowMonthLastDay().Format(utils.FormatDate)
 		} else {