fix:筛选条件保存信息类型调整及校验重复调整

jyBXBase/rpc/internal/logic/checksearchlogic.go

@@ -7,6 +7,7 @@ import (
 	"crypto/md5"
 	"fmt"
 	IC "jyBXBase/rpc/init"
+	"jyBXBase/rpc/util"
 	"log"
 	"net/url"
 	"sort"
@@ -64,6 +65,18 @@ func (l *CheckSearchLogic) CheckSearch(in *bxbase.AddSearchReq) (res *bxbase.Che
 	in.BuyerClass = ValueSort(in.BuyerClass)
 	in.NotKey = ValueSort(in.NotKey)
 	in.AdditionalWords = ValueSort(in.AdditionalWords)
+	// 搜索分组为 1-招标采购公告时 2 超前项目
+	// 当所选择的信息类型是全选时，需要处理成和全部时一样的空串
+	switch in.SearchGroup {
+	case util.SearchGroupBidding:
+		if ValueSort(util.TopTypesBidding) == in.Industry {
+			in.Industry = ""
+		}
+	case util.SearchGroupLeadingProject:
+		if ValueSort(util.TopTypesLeadingProject) == in.Industry {
+			in.Industry = ""
+		}
+	}
 
 	inMap := common.StructToMapMore(in)
 	inKey := GetKeysByParam(inMap)
@@ -89,7 +102,7 @@ func GetKeysByParam(param map[string]interface{}) string {
 	ps := &paramSorter{[]string{}, []string{}}
 	for k, v := range param {
 		ps.Keys = append(ps.Keys, k)
-		ps.Values = append(ps.Values, common.ObjToString(v))
+		ps.Values = append(ps.Values, common.InterfaceToStr(v))
 	}
 	ps.Sort()
 	reqStr := ps.String()

jyBXBase/rpc/util/common.go

@@ -18,9 +18,13 @@ import (
 )
 
 const (
-	query          = `{"query":{"terms":{"_id":["%s"]}},"_source":["_id","subtype","s_winner","buyertel","winnertel","buyerclass"],"from":0,"size":%d}`
-	mongodb_fields = `{"_id":1,"area":1,"publishtime":1,"s_subscopeclass":1,"subtype":1,"title":1,"toptype":1,"type":1, "buyerclass":1,"budget":1,"bidamount":1,"winnertel":1,"s_winner":1,"buyertel":1,"attach_text":1}`
-	querys         = `{"query":{"terms":{"_id":["%s"]}},"_source":["_id","title","detail","area","city","publishtime","projectname","buyer","buyerclass","s_winner","bidamount","subtype","toptype","projectcode","buyertel","budget","bidopentime","agency","projectscope","winnerperson","winnertel"],"from":0,"size":%d}}`
+	query                     = `{"query":{"terms":{"_id":["%s"]}},"_source":["_id","subtype","s_winner","buyertel","winnertel","buyerclass"],"from":0,"size":%d}`
+	mongodb_fields            = `{"_id":1,"area":1,"publishtime":1,"s_subscopeclass":1,"subtype":1,"title":1,"toptype":1,"type":1, "buyerclass":1,"budget":1,"bidamount":1,"winnertel":1,"s_winner":1,"buyertel":1,"attach_text":1}`
+	querys                    = `{"query":{"terms":{"_id":["%s"]}},"_source":["_id","title","detail","area","city","publishtime","projectname","buyer","buyerclass","s_winner","bidamount","subtype","toptype","projectcode","buyertel","budget","bidopentime","agency","projectscope","winnerperson","winnertel"],"from":0,"size":%d}}`
+	SearchGroupBidding        = 1 // 搜索分组：1：招标采购公告；2：超前项目
+	SearchGroupLeadingProject = 2 // 搜索分组：1：招标采购公告；2：超前项目
+	TopTypesBidding           = "招标预告,招标公告,招标结果,招标信用信息"
+	TopTypesLeadingProject    = "拟建项目,采购意向"
 )
 
 //是否是付费用户 -bool: true:是 fasle:不是