feat:查询过滤拟建项目和采购意向

internal/service/keyWordLetterStruct.go

@@ -75,6 +75,7 @@ func (sRoot *keyWordLetterRoot) LoadLetterKeyWord(ctx context.Context) {
 	sRoot.initialLetterKeyWord = initialLetterKeyWord
 }
 
+// GetData 查询数据
 func (sRoot *keyWordLetterRoot) GetData(ctx context.Context, maxTotal int, query *SeoBiddingQuery) []map[string]interface{} {
 	var sql string
 	var values []interface{}
@@ -93,7 +94,7 @@ func (sRoot *keyWordLetterRoot) GetData(ctx context.Context, maxTotal int, query
 	if err != nil || queryRes.IsEmpty() {
 		return nil
 	}
-	return FillingBiddingBaseFields(ctx, queryRes.List())
+	return FillingBiddingBaseFields(ctx, queryRes.List(), true)
 }
 
 func (sRoot *keyWordLetterRoot) GetEsData(ctx context.Context, maxTotal int, query *SeoBiddingQuery) []map[string]interface{} {

internal/service/keyWordPinyinHotStruct.go

@@ -50,6 +50,7 @@ func (sRoot *keywordPinyinRoot) LoadKeyWordFull(ctx context.Context) {
 	sRoot.industryMap = industryMap
 }
 
+// GetData 查询数据
 func (sRoot *keywordPinyinRoot) GetData(ctx context.Context, maxTotal int, query *SeoBiddingQuery) []map[string]interface{} {
 	var sql string
 	var values []interface{}
@@ -70,7 +71,7 @@ func (sRoot *keywordPinyinRoot) GetData(ctx context.Context, maxTotal int, query
 	if err != nil || queryRes.IsEmpty() {
 		return nil
 	}
-	return FillingBiddingBaseFields(ctx, queryRes.List())
+	return FillingBiddingBaseFields(ctx, queryRes.List(), true)
 
 	//res, err := g.DB().Query(ctx, "SELECT * FROM new_bidList WHERE bid_id IN ( SELECT bid_id  FROM  new_pinyinKeywords b WHERE 1=1 "+sql+" order by publish_time desc limit 0,? ) ORDER BY publish_time desc LIMIT 0, ?", values...)
 	//if err != nil {

internal/service/keyWordSiteStruct.go

@@ -72,6 +72,7 @@ func (sRoot *KeyWordSiteRoot) LoadSiteFromConf(ctx context.Context) {
 	sRoot.SiteCodeMap = siteCodeMap
 }
 
+// GetData 查询数据
 func (sRoot *KeyWordSiteRoot) GetData(ctx context.Context, maxTotal int, query *SeoBiddingQuery) []map[string]interface{} {
 	var sql string
 	var values []interface{}
@@ -100,7 +101,7 @@ func (sRoot *KeyWordSiteRoot) GetData(ctx context.Context, maxTotal int, query *
 	if err != nil || queryRes.IsEmpty() {
 		return nil
 	}
-	return FillingBiddingBaseFields(ctx, queryRes.List())
+	return FillingBiddingBaseFields(ctx, queryRes.List(), true)
 }
 
 func (kws *KeyWordSiteNode) GetKeyWord(areaNode *AreaNode) string {

internal/service/queryStruct.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"fmt"
 	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
 	"jyseo/internal/consts"
@@ -217,14 +218,19 @@ func (query *SeoBiddingQuery) GetOnceData(ctx context.Context, total int, flag s
 	return
 }
 
-func FillingBiddingBaseFields(ctx context.Context, res []map[string]interface{}) []map[string]interface{} {
+func FillingBiddingBaseFields(ctx context.Context, res []map[string]interface{}, filterNj ...bool) []map[string]interface{} {
 	bidIdStrings := make([]string, 0, len(res))
 	for _, m := range res {
 		if bidId := gconv.String(m["bid_id"]); bidId != "" {
 			bidIdStrings = append(bidIdStrings, bidId)
 		}
 	}
-	bidRes, _ := g.DB().Query(ctx, fmt.Sprintf(`SELECT * FROM new_bidList WHERE bid_id IN ('%s')`, strings.Join(bidIdStrings, "','")))
+	var bidRes gdb.Result
+	if len(filterNj) > 0 { //没有过滤拟建项目和采购意向，需要查询过滤
+		bidRes, _ = g.DB().Query(ctx, fmt.Sprintf(`SELECT * FROM new_bidList WHERE toptype !='拟建' AND toptype !='采购意向' AND bid_id IN ('%s')`, strings.Join(bidIdStrings, "','")))
+	} else { //已经过滤了拟建项目和采购意向
+		bidRes, _ = g.DB().Query(ctx, fmt.Sprintf(`SELECT * FROM new_bidList WHERE bid_id IN ('%s')`, strings.Join(bidIdStrings, "','")))
+	}
 	if bidRes.IsEmpty() {
 		return nil
 	}