|
@@ -10,7 +10,6 @@ import (
|
|
IC "jyBXCore/rpc/init"
|
|
IC "jyBXCore/rpc/init"
|
|
"jyBXCore/rpc/service"
|
|
"jyBXCore/rpc/service"
|
|
"jyBXCore/rpc/util"
|
|
"jyBXCore/rpc/util"
|
|
- "log"
|
|
|
|
"strings"
|
|
"strings"
|
|
)
|
|
)
|
|
|
|
|
|
@@ -79,7 +78,6 @@ func (kws *KeyWordsSearch) GetBidSearchListByCache(in *bxcore.SearchReq) (list [
|
|
if len(l) > 0 {
|
|
if len(l) > 0 {
|
|
list = l[in.PageNum : (in.PageNum+1)*in.PageSize]
|
|
list = l[in.PageNum : (in.PageNum+1)*in.PageSize]
|
|
count = c
|
|
count = c
|
|
- log.Println("list:", len(list))
|
|
|
|
//是否收藏
|
|
//是否收藏
|
|
util.MakeCollection(in.UserId, list)
|
|
util.MakeCollection(in.UserId, list)
|
|
}
|
|
}
|
|
@@ -121,10 +119,30 @@ func (kws *KeyWordsSearch) SaveKeyWordsToHistory(in *bxcore.SearchReq) {
|
|
|
|
|
|
// SearchParamsHandle 搜索条件 处理
|
|
// SearchParamsHandle 搜索条件 处理
|
|
func (kws *KeyWordsSearch) SearchParamsHandle(in *bxcore.SearchReq) {
|
|
func (kws *KeyWordsSearch) SearchParamsHandle(in *bxcore.SearchReq) {
|
|
|
|
+ // in.SearchGroup 搜索分组 搜索分组:默认0:全部;1:招标采购公告;2:超前项目
|
|
|
|
+ if in.SearchGroup < 0 {
|
|
|
|
+ in.SearchGroup = 0
|
|
|
|
+ }
|
|
|
|
+ //信息类型参数为空 根据搜索分组 初始化信息类型
|
|
|
|
+ if in.TopType == "" && in.Subtype == "" {
|
|
|
|
+ in.Subtype = IC.C.DefaultTopTypes[in.SearchGroup]
|
|
|
|
+ }
|
|
|
|
+ // in.SearchMode 搜索模式 搜索模式:0:精准搜索;1:模糊搜索
|
|
|
|
+ if in.SearchMode < 0 {
|
|
|
|
+ in.SearchMode = 0
|
|
|
|
+ }
|
|
|
|
+ // in.WordsMode 搜索关键词模式;默认0:包含所有,1:包含任意
|
|
|
|
+ if in.WordsMode < 0 {
|
|
|
|
+ in.WordsMode = 0
|
|
|
|
+ }
|
|
//默认每页数据量
|
|
//默认每页数据量
|
|
- if in.PageSize == 0 {
|
|
|
|
|
|
+ if in.PageSize <= 0 {
|
|
in.PageSize = 50
|
|
in.PageSize = 50
|
|
}
|
|
}
|
|
|
|
+ //第一页
|
|
|
|
+ if in.PageNum <= 0 {
|
|
|
|
+ in.PageNum = 1
|
|
|
|
+ }
|
|
//行业格式化
|
|
//行业格式化
|
|
if in.Industry != "" {
|
|
if in.Industry != "" {
|
|
in.Industry = strings.TrimSpace(in.Industry)
|
|
in.Industry = strings.TrimSpace(in.Industry)
|
|
@@ -161,16 +179,13 @@ func (kws *KeyWordsSearch) SearchParamsHandle(in *bxcore.SearchReq) {
|
|
|
|
|
|
// GetBidSearchList 非空搜索 查询
|
|
// GetBidSearchList 非空搜索 查询
|
|
func (kws *KeyWordsSearch) GetBidSearchList(in *bxcore.SearchReq) (count int64, list []*bxcore.SearchList, numberMsg string) {
|
|
func (kws *KeyWordsSearch) GetBidSearchList(in *bxcore.SearchReq) (count int64, list []*bxcore.SearchList, numberMsg string) {
|
|
- var start = int((in.PageNum - 1) * in.PageSize)
|
|
|
|
//排除异常in.PageNum参数
|
|
//排除异常in.PageNum参数
|
|
- if start >= 0 {
|
|
|
|
- count, list = service.GetBidSearchData(in)
|
|
|
|
- util.MakeCollection(in.UserId, list)
|
|
|
|
- numberMsg = fmt.Sprintf("%d", count) //返回数据总量提示信息
|
|
|
|
- limitCount := MC.If(in.IsPay, int64(util.SearchPageSize*util.SearchMaxPageNum_PAYED), int64(util.SearchPageSize*util.SearchMaxPageNum)).(int64)
|
|
|
|
- if count > limitCount {
|
|
|
|
- count = limitCount //付费用户count 最多5000条,100页数据,每页50条;免费用户count 最多500条,10页数据,每页50条。
|
|
|
|
- }
|
|
|
|
|
|
+ count, list = service.GetBidSearchData(in)
|
|
|
|
+ util.MakeCollection(in.UserId, list)
|
|
|
|
+ numberMsg = fmt.Sprintf("%d", count) //返回数据总量提示信息
|
|
|
|
+ limitCount := MC.If(in.IsPay, int64(util.SearchPageSize*util.SearchMaxPageNum_PAYED), int64(util.SearchPageSize*util.SearchMaxPageNum)).(int64)
|
|
|
|
+ if count > limitCount {
|
|
|
|
+ count = limitCount //付费用户count 最多5000条,100页数据,每页50条;免费用户count 最多500条,10页数据,每页50条。
|
|
}
|
|
}
|
|
return
|
|
return
|
|
}
|
|
}
|