|
@@ -7,6 +7,7 @@ import (
|
|
"hongze/hongze_web_mfyx/utils"
|
|
"hongze/hongze_web_mfyx/utils"
|
|
"strconv"
|
|
"strconv"
|
|
"strings"
|
|
"strings"
|
|
|
|
+ "time"
|
|
)
|
|
)
|
|
|
|
|
|
func GetResourceDataList(condition string, pars []interface{}, startSize, pageSize int, user *models.WxUserItem) (items []*models.CygxResourceDataNewResp, err error) {
|
|
func GetResourceDataList(condition string, pars []interface{}, startSize, pageSize int, user *models.WxUserItem) (items []*models.CygxResourceDataNewResp, err error) {
|
|
@@ -156,7 +157,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
|
|
mapItems[fmt.Sprint("activity", v.ActivityId)].Activity = v
|
|
mapItems[fmt.Sprint("activity", v.ActivityId)].Activity = v
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ fmt.Println(time.Now().UnixMilli())
|
|
//处理研选专栏
|
|
//处理研选专栏
|
|
lenyanxuanSpecialIds := len(yanxuanSpecialIds)
|
|
lenyanxuanSpecialIds := len(yanxuanSpecialIds)
|
|
if lenyanxuanSpecialIds > 0 {
|
|
if lenyanxuanSpecialIds > 0 {
|
|
@@ -177,7 +178,7 @@ func GetResourceDataList(condition string, pars []interface{}, startSize, pageSi
|
|
mapItems[fmt.Sprint(utils.CYGX_OBJ_YANXUANSPECIAL, v.Id)].YanxuanSpecial = v
|
|
mapItems[fmt.Sprint(utils.CYGX_OBJ_YANXUANSPECIAL, v.Id)].YanxuanSpecial = v
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
|
|
+ fmt.Println(time.Now().UnixMilli())
|
|
for _, vList := range list {
|
|
for _, vList := range list {
|
|
for _, v := range mapItems {
|
|
for _, v := range mapItems {
|
|
//如果这些类型都为空,那么就不合并
|
|
//如果这些类型都为空,那么就不合并
|