feat:新增搜索 字段

jyBXCore/api/bxcore.api

@@ -1,6 +1,6 @@
 syntax = "v1"
 
-info (
+info(
 	title: "剑鱼核心模块" // TODO: add title
 	desc: "标讯搜索、标讯详情、参标逻辑等"// TODO: add description
 	author: "wangshan"
@@ -42,6 +42,9 @@ type (
 		PositionId      string `header:"positionId,optional"`   //职位id
 		MgoUserId       string `header:"mgoUserId,optional"`    //原userId
 		District        string `json:"district,optional"`
+		Buyer           string `json:"buyer,optional"`  //采购单位
+		Winner          string `json:"winner,optional"` //中标企业
+		Agency          string `json:"agency,optional"` //代理机构
 	}
 	//
 	commonResp {
@@ -207,36 +210,35 @@ type (
 )
 service bxcore-api {
 	@handler searchList
-	post /jybx/core/:userType/searchList(searchReq) returns (commonResp)
+	post /jybx/core/:userType/searchList (searchReq) returns (commonResp)
 	@handler limitSearchContent
-	post /jybx/core/:searchType/searchLimit(searchLimitReq) returns (commonResp)
+	post /jybx/core/:searchType/searchLimit (searchLimitReq) returns (commonResp)
 	@handler participateShow  // 列表数据参标信息接口
-	post /jybx/core/participate/show(participateShowReq) returns (commonResp)
+	post /jybx/core/participate/show (participateShowReq) returns (commonResp)
 	@handler ParticipateInfo  // 详情页参标信息接口
-	post /jybx/core/participate/info(participateInfoReq) returns (commonResp)
+	post /jybx/core/participate/info (participateInfoReq) returns (commonResp)
 	@handler updateBidStatus  // 投标状态更新
-	post /jybx/core/participate/updateBidStatus(updateBidStatusReq) returns (commonResp)
+	post /jybx/core/participate/updateBidStatus (updateBidStatusReq) returns (commonResp)
 	@handler ParticipateContent  // 获取投标状态信息
-	post /jybx/core/participate/content(participateContentReq) returns (commonResp)
+	post /jybx/core/participate/content (participateContentReq) returns (commonResp)
 	@handler ParticipateRecords  // 参标操作记录
-	post /jybx/core/participate/records(participateRecordsReq) returns (commonResp)
+	post /jybx/core/participate/records (participateRecordsReq) returns (commonResp)
 	@handler ParticipatePersons  // 当前部门/企业下参标人员信息
-	post /jybx/core/participate/persons(participatePersonsReq) returns (commonResp)
+	post /jybx/core/participate/persons (participatePersonsReq) returns (commonResp)
 	@handler participateSetUpInfo // 参标设置信息
-	post /jybx/core/participate/setUpInfo(participateSetUpInfoReq) returns (commonResp)
+	post /jybx/core/participate/setUpInfo (participateSetUpInfoReq) returns (commonResp)
 	@handler participateAction //参标|终止参标|划转项目
-	post /jybx/core/participate/:actionType/info(participateActionReq) returns (commonResp)
+	post /jybx/core/participate/:actionType/info (participateActionReq) returns (commonResp)
 	@handler participateList //我的参标项目列表|企业参标项目列表
-	post /jybx/core/participate/:identity/list(participateListReq) returns (commonResp)
+	post /jybx/core/participate/:identity/list (participateListReq) returns (commonResp)
 	@handler pushStatistics //	订阅推送统计
-	post /jybx/core/statistics/pushStatistics(ptatisticsListReq) returns (commonPushResp)
+	post /jybx/core/statistics/pushStatistics (ptatisticsListReq) returns (commonPushResp)
 	@handler projectStatistics//参标项目统计
-	post /jybx/core/statistics/projectStatistics(ptatisticsListReq) returns (commonResp)
+	post /jybx/core/statistics/projectStatistics (ptatisticsListReq) returns (commonResp)
 	@handler polymerizeSearch//参标项目统计
-	post /jybx/core/polymerizeSearch(polymerizeSearchReq) returns (commonResp)
+	post /jybx/core/polymerizeSearch (polymerizeSearchReq) returns (commonResp)
 	@handler statisticsProjectDetails//参标项目明细
-	post /jybx/core/statistics/projectDetails(ProjectDetailReq) returns (commonResp)
+	post /jybx/core/statistics/projectDetails (ProjectDetailReq) returns (commonResp)
 	@handler searchCriteria //物业搜索条件返回
-	post /jybx/core/property/searchCriteria() returns (commonResp)
-
+	post /jybx/core/property/searchCriteria () returns (commonResp)
 }

jyBXCore/api/internal/logic/searchListLogic.go

@@ -75,6 +75,9 @@ func (l *SearchListLogic) SearchList(req *types.SearchReq) (resp *types.CommonRe
 		LimitFlag:       limitFlag,
 		IsNew:           isNew,
 		District:        req.District,
+		Buyer:           req.Buyer,
+		Winner:          req.Winner,
+		Agency:          req.Agency,
 	})
 
 	log.Println("请求接口耗时：", time.Since(t).Seconds())

jyBXCore/api/internal/types/types.go

@@ -35,6 +35,9 @@ type SearchReq struct {
 	PositionId      string `header:"positionId,optional"`   //职位id
 	MgoUserId       string `header:"mgoUserId,optional"`    //原userId
 	District        string `json:"district,optional"`
+	Buyer           string `json:"buyer,optional"`  //采购单位
+	Winner          string `json:"winner,optional"` //中标企业
+	Agency          string `json:"agency,optional"` //代理机构
 }
 
 type CommonResp struct {

jyBXCore/rpc/bxcore.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-import    "google/protobuf/any.proto";
+//import    "google/protobuf/any.proto";
 package bxcore;
 option go_package = "./bxcore";
 
@@ -43,6 +43,9 @@ message SearchReq {
   string limitFlag = 37; //未登录用户生成一个随机id
   bool isNew = 38;//未登录用户首次请求
   string  district = 39;//区县
+  string  buyer = 40;//采购单位
+  string  winner = 41;//中标企业
+  string  agency = 42;//代理机构
 }
 
 message SearchResp {
@@ -468,16 +471,16 @@ message ProjectDetailsReq{
   int64 endTime = 7;
   repeated int64 source = 8; // source  0:全部  1：个人订阅 2：企业自动分发 3：企业手动分发
   int64 bidWay = 9; //   -1:全部 1：直接投标 2：渠道投标
-  int64 bidUpdateStartTime =10;// 参标状态跟新时间开始
-  int64 bidUpdateEndTime =11;// 参标状态跟新时间结束
+  int64 bidUpdateStartTime = 10;// 参标状态跟新时间开始
+  int64 bidUpdateEndTime = 11;// 参标状态跟新时间结束
   int64 isParticipate = 12;// -1全部 1-已参标是 0-未参标否
   int64 PageNum = 13;// 页码 从1开始
-  int64 PageSize =14;// 每页条数 默认50
+  int64 PageSize = 14;// 每页条数 默认50
 }
 // 筛选项
 message sourceItem{
- string name =1;
- int64  value =2;
+  string name = 1;
+  int64  value = 2;
 }
 message PushStatisticsDataRes{
   int64 err_code = 1;
@@ -503,33 +506,33 @@ message ProjectStatisticsDataRes{
   repeated ProjectStatisticsData data = 3;
 }
 message StageValue{
-  string Name =1 ;
-  string Value =2 ;
-  string Date =3;
+  string Name = 1 ;
+  string Value = 2 ;
+  string Date = 3;
 }
 
 message ProjectDetailData {
-  string  projectName =1 ;// 项目名称
+  string  projectName = 1 ;// 项目名称
   string  source = 2 ; // 标讯/项目来源 '来源；1：个人订阅 2：企业自动分发 3：企业手动分发
   string  isDistribute = 3 ;// 手动分发状态  1已分发
-  string  disDate =4 ; // 分发时间
+  string  disDate = 4 ; // 分发时间
   string  viewDate = 5 ;//最早浏览时间
-  string  id =7 ;// 项目id
-  repeated StageValue stage =6 ;// 阶段相关信息  <阶段名称,勾选时间>
+  string  id = 7 ;// 项目id
+  repeated StageValue stage = 6 ;// 阶段相关信息  <阶段名称,勾选时间>
 }
 message DetailData{
   repeated ProjectDetailData list = 1;
-  int64    total  = 2;
+  int64    total = 2;
 }
 message DetailDataRes{
   int64 err_code = 1;
   string err_msg = 2;
-  DetailData data =3;
-  }
+  DetailData data = 3;
+}
 message SearchCriteriaRes{
   int64 err_code = 1;
   string err_msg = 2;
-  string data =3;
+  string data = 3;
 }
 message ProjectStatisticsData{
   string  personName = 1;
@@ -571,7 +574,7 @@ message SearchReturn{
 }
 message SearchMap{
   repeated Search data = 1;
-  int64  count=2;
+  int64  count = 2;
 }
 message Search{
   string title = 1;
@@ -588,7 +591,7 @@ message MenuList{
   string openType = 7;
   TipInfo tipInfo = 8;
   repeated  string match = 10;
-  string  path=11;
+  string  path = 11;
 }
 
 message TipInfo {

jyBXCore/rpc/bxcore/bxcore.go

@@ -1,4 +1,4 @@
-// Code generated by goctl. DO NOT EDIT.
+// Code generated by goctl. DO NOT EDIT!
 // Source: bxcore.proto
 
 package bxcore
@@ -75,23 +75,23 @@ type (
 		GetSearchList(ctx context.Context, in *SearchReq, opts ...grpc.CallOption) (*SearchResp, error)
 		// 标讯搜索限制内容
 		SearchLimit(ctx context.Context, in *SearchLimitReq, opts ...grpc.CallOption) (*SearchLimitResp, error)
-		// 列表数据参标信息接口
+		//  列表数据参标信息接口
 		ParticipateShow(ctx context.Context, in *ParticipateShowReq, opts ...grpc.CallOption) (*ParticipateShowRes, error)
-		// 详情页参标信息接口
+		//  详情页参标信息接口
 		ParticipateInfo(ctx context.Context, in *ParticipateInfoReq, opts ...grpc.CallOption) (*ParticipateInfoRes, error)
-		// 投标状态更新
+		//   投标状态更新
 		UpdateBidStatus(ctx context.Context, in *UpdateBidStatusReq, opts ...grpc.CallOption) (*UpdateBidStatusRes, error)
-		// 获取投标状态信息
+		//  获取投标状态信息
 		ParticipateContent(ctx context.Context, in *ParticipateContentReq, opts ...grpc.CallOption) (*ParticipateContentRes, error)
-		// 参标操作记录
+		//  参标操作记录
 		ParticipateRecords(ctx context.Context, in *ParticipateRecordsReq, opts ...grpc.CallOption) (*ParticipateRecordsRes, error)
-		// 当前部门/企业下参标人员信息
+		//  当前部门/企业下参标人员信息
 		ParticipatePersons(ctx context.Context, in *ParticipatePersonsReq, opts ...grpc.CallOption) (*ParticipatePersonsRes, error)
-		// 参标设置信息
+		//  参标设置信息
 		ParticipateSetUpInfo(ctx context.Context, in *ParticipateSetUpInfoReq, opts ...grpc.CallOption) (*ParticipateSetUpInfoRes, error)
-		// 项目参标 终止参标 划转等动作
+		//  项目参标 终止参标 划转等动作
 		ParticipateAction(ctx context.Context, in *ParticipateActionReq, opts ...grpc.CallOption) (*ParticipateActionRes, error)
-		// 我的参标项目列表|企业参标项目列表
+		//  我的参标项目列表|企业参标项目列表
 		ParticipateList(ctx context.Context, in *ParticipateListReq, opts ...grpc.CallOption) (*ParticipateListRes, error)
 		// 推送参标统计
 		PushStatistics(ctx context.Context, in *StatisticsListReq, opts ...grpc.CallOption) (*PushStatisticsDataRes, error)

jyBXCore/rpc/internal/logic/getsearchlistlogic.go

@@ -30,7 +30,6 @@ func NewGetSearchListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Get
 	}
 }
 
-// GetSearchList 标讯搜索结果列表数据
 // GetSearchList 标讯搜索结果列表数据
 func (l *GetSearchListLogic) GetSearchList(in *bxcore.SearchReq) (*bxcore.SearchResp, error) {
 	defer MC.Catch()

jyBXCore/rpc/internal/server/bxcoreserver.go

@@ -1,4 +1,4 @@
-// Code generated by goctl. DO NOT EDIT.
+// Code generated by goctl. DO NOT EDIT!
 // Source: bxcore.proto
 
 package server
@@ -34,55 +34,55 @@ func (s *BxCoreServer) SearchLimit(ctx context.Context, in *bxcore.SearchLimitRe
 	return l.SearchLimit(in)
 }
 
-// 列表数据参标信息接口
+//  列表数据参标信息接口
 func (s *BxCoreServer) ParticipateShow(ctx context.Context, in *bxcore.ParticipateShowReq) (*bxcore.ParticipateShowRes, error) {
 	l := logic.NewParticipateShowLogic(ctx, s.svcCtx)
 	return l.ParticipateShow(in)
 }
 
-// 详情页参标信息接口
+//  详情页参标信息接口
 func (s *BxCoreServer) ParticipateInfo(ctx context.Context, in *bxcore.ParticipateInfoReq) (*bxcore.ParticipateInfoRes, error) {
 	l := logic.NewParticipateInfoLogic(ctx, s.svcCtx)
 	return l.ParticipateInfo(in)
 }
 
-// 投标状态更新
+//   投标状态更新
 func (s *BxCoreServer) UpdateBidStatus(ctx context.Context, in *bxcore.UpdateBidStatusReq) (*bxcore.UpdateBidStatusRes, error) {
 	l := logic.NewUpdateBidStatusLogic(ctx, s.svcCtx)
 	return l.UpdateBidStatus(in)
 }
 
-// 获取投标状态信息
+//  获取投标状态信息
 func (s *BxCoreServer) ParticipateContent(ctx context.Context, in *bxcore.ParticipateContentReq) (*bxcore.ParticipateContentRes, error) {
 	l := logic.NewParticipateContentLogic(ctx, s.svcCtx)
 	return l.ParticipateContent(in)
 }
 
-// 参标操作记录
+//  参标操作记录
 func (s *BxCoreServer) ParticipateRecords(ctx context.Context, in *bxcore.ParticipateRecordsReq) (*bxcore.ParticipateRecordsRes, error) {
 	l := logic.NewParticipateRecordsLogic(ctx, s.svcCtx)
 	return l.ParticipateRecords(in)
 }
 
-// 当前部门/企业下参标人员信息
+//  当前部门/企业下参标人员信息
 func (s *BxCoreServer) ParticipatePersons(ctx context.Context, in *bxcore.ParticipatePersonsReq) (*bxcore.ParticipatePersonsRes, error) {
 	l := logic.NewParticipatePersonsLogic(ctx, s.svcCtx)
 	return l.ParticipatePersons(in)
 }
 
-// 参标设置信息
+//  参标设置信息
 func (s *BxCoreServer) ParticipateSetUpInfo(ctx context.Context, in *bxcore.ParticipateSetUpInfoReq) (*bxcore.ParticipateSetUpInfoRes, error) {
 	l := logic.NewParticipateSetUpInfoLogic(ctx, s.svcCtx)
 	return l.ParticipateSetUpInfo(in)
 }
 
-// 项目参标 终止参标 划转等动作
+//  项目参标 终止参标 划转等动作
 func (s *BxCoreServer) ParticipateAction(ctx context.Context, in *bxcore.ParticipateActionReq) (*bxcore.ParticipateActionRes, error) {
 	l := logic.NewParticipateActionLogic(ctx, s.svcCtx)
 	return l.ParticipateAction(in)
 }
 
-// 我的参标项目列表|企业参标项目列表
+//  我的参标项目列表|企业参标项目列表
 func (s *BxCoreServer) ParticipateList(ctx context.Context, in *bxcore.ParticipateListReq) (*bxcore.ParticipateListRes, error) {
 	l := logic.NewParticipateListLogic(ctx, s.svcCtx)
 	return l.ParticipateList(in)

jyBXCore/rpc/model/es/search.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"jyBXCore/rpc/bxcore"
 	IC "jyBXCore/rpc/init"
+	"jyBXCore/rpc/util"
 	"strconv"
 	"strings"
 	"time"
@@ -32,6 +33,18 @@ func GetSearchQuery(in *bxcore.SearchReq, mustQuery string) (qstr string) {
 	if mustQuery != "" {
 		musts = append(musts, mustQuery)
 	}
+	//采购单位
+	if in.Buyer != "" {
+		musts = append(musts, util.GetMatchArrSql("buyer.mbuyer", strings.Split(in.Buyer, ",")...))
+	}
+	//中标单位
+	if in.Winner != "" {
+		musts = append(musts, util.GetMatchArrSql("s_winner.mwinner", strings.Split(in.Winner, ",")...))
+	}
+	//代理机构
+	if in.Agency != "" {
+		musts = append(musts, util.GetMatchArrSql("agency.magency", strings.Split(in.Agency, ",")...))
+	}
 	//此时关键词中间有IC.C.JYKeyMark进行隔离
 	if in.KeyWords != "" {
 		var (

jyBXCore/rpc/type/bxcore/bxcore_grpc.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-grpc. DO NOT EDIT.
 // versions:
-// - protoc-gen-go-grpc v1.3.0
-// - protoc             v3.15.1
+// - protoc-gen-go-grpc v1.2.0
+// - protoc             v3.15.5
 // source: bxcore.proto
 
 package bxcore
@@ -18,38 +18,19 @@ import (
 // Requires gRPC-Go v1.32.0 or later.
 const _ = grpc.SupportPackageIsVersion7
 
-const (
-	BxCore_GetSearchList_FullMethodName          = "/bxcore.BxCore/GetSearchList"
-	BxCore_SearchLimit_FullMethodName            = "/bxcore.BxCore/SearchLimit"
-	BxCore_ParticipateShow_FullMethodName        = "/bxcore.BxCore/ParticipateShow"
-	BxCore_ParticipateInfo_FullMethodName        = "/bxcore.BxCore/ParticipateInfo"
-	BxCore_UpdateBidStatus_FullMethodName        = "/bxcore.BxCore/UpdateBidStatus"
-	BxCore_ParticipateContent_FullMethodName     = "/bxcore.BxCore/ParticipateContent"
-	BxCore_ParticipateRecords_FullMethodName     = "/bxcore.BxCore/ParticipateRecords"
-	BxCore_ParticipatePersons_FullMethodName     = "/bxcore.BxCore/ParticipatePersons"
-	BxCore_ParticipateSetUpInfo_FullMethodName   = "/bxcore.BxCore/ParticipateSetUpInfo"
-	BxCore_ParticipateAction_FullMethodName      = "/bxcore.BxCore/ParticipateAction"
-	BxCore_ParticipateList_FullMethodName        = "/bxcore.BxCore/ParticipateList"
-	BxCore_PushStatistics_FullMethodName         = "/bxcore.BxCore/PushStatistics"
-	BxCore_ProjectStatistics_FullMethodName      = "/bxcore.BxCore/ProjectStatistics"
-	BxCore_PolymerizeSearch_FullMethodName       = "/bxcore.BxCore/PolymerizeSearch"
-	BxCore_ProjectDetails_FullMethodName         = "/bxcore.BxCore/ProjectDetails"
-	BxCore_PropertySearchCriteria_FullMethodName = "/bxcore.BxCore/PropertySearchCriteria"
-)
-
 // BxCoreClient is the client API for BxCore service.
 //
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type BxCoreClient interface {
-	// 标讯搜索结果列表数据
+	//标讯搜索结果列表数据
 	GetSearchList(ctx context.Context, in *SearchReq, opts ...grpc.CallOption) (*SearchResp, error)
-	// 标讯搜索限制内容
+	//标讯搜索限制内容
 	SearchLimit(ctx context.Context, in *SearchLimitReq, opts ...grpc.CallOption) (*SearchLimitResp, error)
 	// 列表数据参标信息接口
 	ParticipateShow(ctx context.Context, in *ParticipateShowReq, opts ...grpc.CallOption) (*ParticipateShowRes, error)
 	// 详情页参标信息接口
 	ParticipateInfo(ctx context.Context, in *ParticipateInfoReq, opts ...grpc.CallOption) (*ParticipateInfoRes, error)
-	// 投标状态更新
+	//  投标状态更新
 	UpdateBidStatus(ctx context.Context, in *UpdateBidStatusReq, opts ...grpc.CallOption) (*UpdateBidStatusRes, error)
 	// 获取投标状态信息
 	ParticipateContent(ctx context.Context, in *ParticipateContentReq, opts ...grpc.CallOption) (*ParticipateContentRes, error)
@@ -63,11 +44,11 @@ type BxCoreClient interface {
 	ParticipateAction(ctx context.Context, in *ParticipateActionReq, opts ...grpc.CallOption) (*ParticipateActionRes, error)
 	// 我的参标项目列表|企业参标项目列表
 	ParticipateList(ctx context.Context, in *ParticipateListReq, opts ...grpc.CallOption) (*ParticipateListRes, error)
-	// 推送参标统计
+	//推送参标统计
 	PushStatistics(ctx context.Context, in *StatisticsListReq, opts ...grpc.CallOption) (*PushStatisticsDataRes, error)
-	// 参标项目统计
+	//参标项目统计
 	ProjectStatistics(ctx context.Context, in *StatisticsListReq, opts ...grpc.CallOption) (*ProjectStatisticsDataRes, error)
-	// 聚合搜索
+	//聚合搜索
 	PolymerizeSearch(ctx context.Context, in *PolymerizeSearchReq, opts ...grpc.CallOption) (*PolymerizeSearchResp, error)
 	ProjectDetails(ctx context.Context, in *ProjectDetailsReq, opts ...grpc.CallOption) (*DetailDataRes, error)
 	PropertySearchCriteria(ctx context.Context, in *SearchReq, opts ...grpc.CallOption) (*SearchCriteriaRes, error)
@@ -83,7 +64,7 @@ func NewBxCoreClient(cc grpc.ClientConnInterface) BxCoreClient {
 
 func (c *bxCoreClient) GetSearchList(ctx context.Context, in *SearchReq, opts ...grpc.CallOption) (*SearchResp, error) {
 	out := new(SearchResp)
-	err := c.cc.Invoke(ctx, BxCore_GetSearchList_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/GetSearchList", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -92,7 +73,7 @@ func (c *bxCoreClient) GetSearchList(ctx context.Context, in *SearchReq, opts ..
 
 func (c *bxCoreClient) SearchLimit(ctx context.Context, in *SearchLimitReq, opts ...grpc.CallOption) (*SearchLimitResp, error) {
 	out := new(SearchLimitResp)
-	err := c.cc.Invoke(ctx, BxCore_SearchLimit_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/SearchLimit", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -101,7 +82,7 @@ func (c *bxCoreClient) SearchLimit(ctx context.Context, in *SearchLimitReq, opts
 
 func (c *bxCoreClient) ParticipateShow(ctx context.Context, in *ParticipateShowReq, opts ...grpc.CallOption) (*ParticipateShowRes, error) {
 	out := new(ParticipateShowRes)
-	err := c.cc.Invoke(ctx, BxCore_ParticipateShow_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/ParticipateShow", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -110,7 +91,7 @@ func (c *bxCoreClient) ParticipateShow(ctx context.Context, in *ParticipateShowR
 
 func (c *bxCoreClient) ParticipateInfo(ctx context.Context, in *ParticipateInfoReq, opts ...grpc.CallOption) (*ParticipateInfoRes, error) {
 	out := new(ParticipateInfoRes)
-	err := c.cc.Invoke(ctx, BxCore_ParticipateInfo_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/ParticipateInfo", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -119,7 +100,7 @@ func (c *bxCoreClient) ParticipateInfo(ctx context.Context, in *ParticipateInfoR
 
 func (c *bxCoreClient) UpdateBidStatus(ctx context.Context, in *UpdateBidStatusReq, opts ...grpc.CallOption) (*UpdateBidStatusRes, error) {
 	out := new(UpdateBidStatusRes)
-	err := c.cc.Invoke(ctx, BxCore_UpdateBidStatus_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/UpdateBidStatus", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -128,7 +109,7 @@ func (c *bxCoreClient) UpdateBidStatus(ctx context.Context, in *UpdateBidStatusR
 
 func (c *bxCoreClient) ParticipateContent(ctx context.Context, in *ParticipateContentReq, opts ...grpc.CallOption) (*ParticipateContentRes, error) {
 	out := new(ParticipateContentRes)
-	err := c.cc.Invoke(ctx, BxCore_ParticipateContent_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/ParticipateContent", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -137,7 +118,7 @@ func (c *bxCoreClient) ParticipateContent(ctx context.Context, in *ParticipateCo
 
 func (c *bxCoreClient) ParticipateRecords(ctx context.Context, in *ParticipateRecordsReq, opts ...grpc.CallOption) (*ParticipateRecordsRes, error) {
 	out := new(ParticipateRecordsRes)
-	err := c.cc.Invoke(ctx, BxCore_ParticipateRecords_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/ParticipateRecords", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -146,7 +127,7 @@ func (c *bxCoreClient) ParticipateRecords(ctx context.Context, in *ParticipateRe
 
 func (c *bxCoreClient) ParticipatePersons(ctx context.Context, in *ParticipatePersonsReq, opts ...grpc.CallOption) (*ParticipatePersonsRes, error) {
 	out := new(ParticipatePersonsRes)
-	err := c.cc.Invoke(ctx, BxCore_ParticipatePersons_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/ParticipatePersons", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -155,7 +136,7 @@ func (c *bxCoreClient) ParticipatePersons(ctx context.Context, in *ParticipatePe
 
 func (c *bxCoreClient) ParticipateSetUpInfo(ctx context.Context, in *ParticipateSetUpInfoReq, opts ...grpc.CallOption) (*ParticipateSetUpInfoRes, error) {
 	out := new(ParticipateSetUpInfoRes)
-	err := c.cc.Invoke(ctx, BxCore_ParticipateSetUpInfo_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/ParticipateSetUpInfo", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -164,7 +145,7 @@ func (c *bxCoreClient) ParticipateSetUpInfo(ctx context.Context, in *Participate
 
 func (c *bxCoreClient) ParticipateAction(ctx context.Context, in *ParticipateActionReq, opts ...grpc.CallOption) (*ParticipateActionRes, error) {
 	out := new(ParticipateActionRes)
-	err := c.cc.Invoke(ctx, BxCore_ParticipateAction_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/ParticipateAction", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -173,7 +154,7 @@ func (c *bxCoreClient) ParticipateAction(ctx context.Context, in *ParticipateAct
 
 func (c *bxCoreClient) ParticipateList(ctx context.Context, in *ParticipateListReq, opts ...grpc.CallOption) (*ParticipateListRes, error) {
 	out := new(ParticipateListRes)
-	err := c.cc.Invoke(ctx, BxCore_ParticipateList_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/ParticipateList", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -182,7 +163,7 @@ func (c *bxCoreClient) ParticipateList(ctx context.Context, in *ParticipateListR
 
 func (c *bxCoreClient) PushStatistics(ctx context.Context, in *StatisticsListReq, opts ...grpc.CallOption) (*PushStatisticsDataRes, error) {
 	out := new(PushStatisticsDataRes)
-	err := c.cc.Invoke(ctx, BxCore_PushStatistics_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/PushStatistics", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -191,7 +172,7 @@ func (c *bxCoreClient) PushStatistics(ctx context.Context, in *StatisticsListReq
 
 func (c *bxCoreClient) ProjectStatistics(ctx context.Context, in *StatisticsListReq, opts ...grpc.CallOption) (*ProjectStatisticsDataRes, error) {
 	out := new(ProjectStatisticsDataRes)
-	err := c.cc.Invoke(ctx, BxCore_ProjectStatistics_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/ProjectStatistics", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -200,7 +181,7 @@ func (c *bxCoreClient) ProjectStatistics(ctx context.Context, in *StatisticsList
 
 func (c *bxCoreClient) PolymerizeSearch(ctx context.Context, in *PolymerizeSearchReq, opts ...grpc.CallOption) (*PolymerizeSearchResp, error) {
 	out := new(PolymerizeSearchResp)
-	err := c.cc.Invoke(ctx, BxCore_PolymerizeSearch_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/PolymerizeSearch", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -209,7 +190,7 @@ func (c *bxCoreClient) PolymerizeSearch(ctx context.Context, in *PolymerizeSearc
 
 func (c *bxCoreClient) ProjectDetails(ctx context.Context, in *ProjectDetailsReq, opts ...grpc.CallOption) (*DetailDataRes, error) {
 	out := new(DetailDataRes)
-	err := c.cc.Invoke(ctx, BxCore_ProjectDetails_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/ProjectDetails", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -218,7 +199,7 @@ func (c *bxCoreClient) ProjectDetails(ctx context.Context, in *ProjectDetailsReq
 
 func (c *bxCoreClient) PropertySearchCriteria(ctx context.Context, in *SearchReq, opts ...grpc.CallOption) (*SearchCriteriaRes, error) {
 	out := new(SearchCriteriaRes)
-	err := c.cc.Invoke(ctx, BxCore_PropertySearchCriteria_FullMethodName, in, out, opts...)
+	err := c.cc.Invoke(ctx, "/bxcore.BxCore/PropertySearchCriteria", in, out, opts...)
 	if err != nil {
 		return nil, err
 	}
@@ -229,15 +210,15 @@ func (c *bxCoreClient) PropertySearchCriteria(ctx context.Context, in *SearchReq
 // All implementations must embed UnimplementedBxCoreServer
 // for forward compatibility
 type BxCoreServer interface {
-	// 标讯搜索结果列表数据
+	//标讯搜索结果列表数据
 	GetSearchList(context.Context, *SearchReq) (*SearchResp, error)
-	// 标讯搜索限制内容
+	//标讯搜索限制内容
 	SearchLimit(context.Context, *SearchLimitReq) (*SearchLimitResp, error)
 	// 列表数据参标信息接口
 	ParticipateShow(context.Context, *ParticipateShowReq) (*ParticipateShowRes, error)
 	// 详情页参标信息接口
 	ParticipateInfo(context.Context, *ParticipateInfoReq) (*ParticipateInfoRes, error)
-	// 投标状态更新
+	//  投标状态更新
 	UpdateBidStatus(context.Context, *UpdateBidStatusReq) (*UpdateBidStatusRes, error)
 	// 获取投标状态信息
 	ParticipateContent(context.Context, *ParticipateContentReq) (*ParticipateContentRes, error)
@@ -251,11 +232,11 @@ type BxCoreServer interface {
 	ParticipateAction(context.Context, *ParticipateActionReq) (*ParticipateActionRes, error)
 	// 我的参标项目列表|企业参标项目列表
 	ParticipateList(context.Context, *ParticipateListReq) (*ParticipateListRes, error)
-	// 推送参标统计
+	//推送参标统计
 	PushStatistics(context.Context, *StatisticsListReq) (*PushStatisticsDataRes, error)
-	// 参标项目统计
+	//参标项目统计
 	ProjectStatistics(context.Context, *StatisticsListReq) (*ProjectStatisticsDataRes, error)
-	// 聚合搜索
+	//聚合搜索
 	PolymerizeSearch(context.Context, *PolymerizeSearchReq) (*PolymerizeSearchResp, error)
 	ProjectDetails(context.Context, *ProjectDetailsReq) (*DetailDataRes, error)
 	PropertySearchCriteria(context.Context, *SearchReq) (*SearchCriteriaRes, error)
@@ -337,7 +318,7 @@ func _BxCore_GetSearchList_Handler(srv interface{}, ctx context.Context, dec fun
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_GetSearchList_FullMethodName,
+		FullMethod: "/bxcore.BxCore/GetSearchList",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).GetSearchList(ctx, req.(*SearchReq))
@@ -355,7 +336,7 @@ func _BxCore_SearchLimit_Handler(srv interface{}, ctx context.Context, dec func(
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_SearchLimit_FullMethodName,
+		FullMethod: "/bxcore.BxCore/SearchLimit",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).SearchLimit(ctx, req.(*SearchLimitReq))
@@ -373,7 +354,7 @@ func _BxCore_ParticipateShow_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_ParticipateShow_FullMethodName,
+		FullMethod: "/bxcore.BxCore/ParticipateShow",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).ParticipateShow(ctx, req.(*ParticipateShowReq))
@@ -391,7 +372,7 @@ func _BxCore_ParticipateInfo_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_ParticipateInfo_FullMethodName,
+		FullMethod: "/bxcore.BxCore/ParticipateInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).ParticipateInfo(ctx, req.(*ParticipateInfoReq))
@@ -409,7 +390,7 @@ func _BxCore_UpdateBidStatus_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_UpdateBidStatus_FullMethodName,
+		FullMethod: "/bxcore.BxCore/UpdateBidStatus",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).UpdateBidStatus(ctx, req.(*UpdateBidStatusReq))
@@ -427,7 +408,7 @@ func _BxCore_ParticipateContent_Handler(srv interface{}, ctx context.Context, de
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_ParticipateContent_FullMethodName,
+		FullMethod: "/bxcore.BxCore/ParticipateContent",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).ParticipateContent(ctx, req.(*ParticipateContentReq))
@@ -445,7 +426,7 @@ func _BxCore_ParticipateRecords_Handler(srv interface{}, ctx context.Context, de
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_ParticipateRecords_FullMethodName,
+		FullMethod: "/bxcore.BxCore/ParticipateRecords",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).ParticipateRecords(ctx, req.(*ParticipateRecordsReq))
@@ -463,7 +444,7 @@ func _BxCore_ParticipatePersons_Handler(srv interface{}, ctx context.Context, de
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_ParticipatePersons_FullMethodName,
+		FullMethod: "/bxcore.BxCore/ParticipatePersons",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).ParticipatePersons(ctx, req.(*ParticipatePersonsReq))
@@ -481,7 +462,7 @@ func _BxCore_ParticipateSetUpInfo_Handler(srv interface{}, ctx context.Context,
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_ParticipateSetUpInfo_FullMethodName,
+		FullMethod: "/bxcore.BxCore/ParticipateSetUpInfo",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).ParticipateSetUpInfo(ctx, req.(*ParticipateSetUpInfoReq))
@@ -499,7 +480,7 @@ func _BxCore_ParticipateAction_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_ParticipateAction_FullMethodName,
+		FullMethod: "/bxcore.BxCore/ParticipateAction",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).ParticipateAction(ctx, req.(*ParticipateActionReq))
@@ -517,7 +498,7 @@ func _BxCore_ParticipateList_Handler(srv interface{}, ctx context.Context, dec f
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_ParticipateList_FullMethodName,
+		FullMethod: "/bxcore.BxCore/ParticipateList",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).ParticipateList(ctx, req.(*ParticipateListReq))
@@ -535,7 +516,7 @@ func _BxCore_PushStatistics_Handler(srv interface{}, ctx context.Context, dec fu
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_PushStatistics_FullMethodName,
+		FullMethod: "/bxcore.BxCore/PushStatistics",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).PushStatistics(ctx, req.(*StatisticsListReq))
@@ -553,7 +534,7 @@ func _BxCore_ProjectStatistics_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_ProjectStatistics_FullMethodName,
+		FullMethod: "/bxcore.BxCore/ProjectStatistics",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).ProjectStatistics(ctx, req.(*StatisticsListReq))
@@ -571,7 +552,7 @@ func _BxCore_PolymerizeSearch_Handler(srv interface{}, ctx context.Context, dec
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_PolymerizeSearch_FullMethodName,
+		FullMethod: "/bxcore.BxCore/PolymerizeSearch",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).PolymerizeSearch(ctx, req.(*PolymerizeSearchReq))
@@ -589,7 +570,7 @@ func _BxCore_ProjectDetails_Handler(srv interface{}, ctx context.Context, dec fu
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_ProjectDetails_FullMethodName,
+		FullMethod: "/bxcore.BxCore/ProjectDetails",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).ProjectDetails(ctx, req.(*ProjectDetailsReq))
@@ -607,7 +588,7 @@ func _BxCore_PropertySearchCriteria_Handler(srv interface{}, ctx context.Context
 	}
 	info := &grpc.UnaryServerInfo{
 		Server:     srv,
-		FullMethod: BxCore_PropertySearchCriteria_FullMethodName,
+		FullMethod: "/bxcore.BxCore/PropertySearchCriteria",
 	}
 	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
 		return srv.(BxCoreServer).PropertySearchCriteria(ctx, req.(*SearchReq))

jyBXCore/rpc/util/search.go

@@ -343,3 +343,21 @@ func GetQueryItems(selectType string, limitOldTime, registerData int64, isPay bo
 	}
 	return
 }
+
+// 采购单位、中标企业、代理机构
+var GetMatchArrSql = func(field string, val ...string) (sql string) {
+	if len(val) == 0 {
+		return
+	}
+	var arr []string
+	for _, s := range val {
+		if s == "" {
+			continue
+		}
+		arr = append(arr, fmt.Sprintf(`{"match_phrase": {"%s": "%s"}}`, field, s))
+	}
+	if len(arr) == 0 {
+		return ""
+	}
+	return fmt.Sprintf(`{"bool": {"should": [%s],"minimum_should_match": 1}}`, strings.Join(arr, ","))
+}