Merge branch 'cygx_8.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

services/activity_my_schedule.go

@@ -2,7 +2,6 @@ package services
 
 import (
 	"errors"
-	"fmt"
 	"hongze/hongze_cygx/models"
 	"hongze/hongze_cygx/utils"
 	"strconv"
@@ -19,7 +18,6 @@ func GetScheduleAndSpecilList(user *models.WxUserItem, condition string, startSi
 	parsSpecil = append(parsSpecil, user.UserId)
 	list, e := models.GetScheduleAndSpecilList(condition, pars, conditionSpecil, parsSpecil, startSize, pageSize)
 	if e != nil {
-		fmt.Println(e)
 		err = errors.New("GetScheduleAndSpecilList, Err: " + e.Error())
 		return
 	}
@@ -28,9 +26,11 @@ func GetScheduleAndSpecilList(user *models.WxUserItem, condition string, startSi
 	for k, v := range list {
 		if v.SourceType == 2 {
 			activitySpecilalIds = append(activitySpecilalIds, v.ActivityId)
+			//把专项调研的线下改为活动的线下类型
 			if v.ActivityType == 2 {
 				list[k].ActivityType = 0
 			}
+			list[k].IsShowSignup = true
 		} else {
 			activityIds = append(activityIds, v.ActivityId)
 		}
@@ -81,7 +81,7 @@ func GetScheduleAndSpecilList(user *models.WxUserItem, condition string, startSi
 	//处理专项产业调研
 	if len(activitySpecilalIds) > 0 {
 		//处理用户是否报名
-		UserMap, e := GetSpecialTripUserMap(activityIds, user.UserId)
+		UserMap, e := GetSpecialTripUserMap(activitySpecilalIds, user.UserId)
 		if e != nil {
 			err = errors.New("GetSpecialTripUserMap, Err: " + e.Error())
 			return

services/activity_special.go

@@ -259,7 +259,7 @@ func GetSpecialTripUserMap(activityIds []int, userId int) (mapUserId map[int]int
 	}
 	mapUid := make(map[int]int)
 	for _, v := range list {
-		mapUid[v.UserId] = v.UserId
+		mapUid[v.ActivityId] = v.UserId
 	}
 	mapUserId = mapUid
 	return