wip:调整保存筛选条件字段类型

jyBXBase/api/bxbase.api

@@ -87,9 +87,9 @@ type (
 		FileExists      string `json:"fileExists,optional"` //附件
 		Notkey          string `json:"notkey,optional"`     //排除词 关键词：排除词（副：五组，每组最多15个字符）
 		InKey           string `json:"inkey,optional"`
-		SearchGroup     string `json:"searchGroup,optional"`     // 搜索分组：默认0：全部；1：招标采购公告；2：超前项目
-		SearchMode      string `json:"searchMode,optional"`      // 搜索模式：0：精准搜索；1：模糊搜索
-		WordsMode       string `json:"wordsMode,optional"`       // 搜索关键词模式；默认0：包含所有，1：包含任意
+		SearchGroup     int    `json:"searchGroup,optional"`     // 搜索分组：默认0：全部；1：招标采购公告；2：超前项目
+		SearchMode      int    `json:"searchMode,optional"`      // 搜索模式：0：精准搜索；1：模糊搜索
+		WordsMode       int    `json:"wordsMode,optional"`       // 搜索关键词模式；默认0：包含所有，1：包含任意
 		AdditionalWords string `json:"additionalWords,optional"` // 关键词：附加关键词（副：五组，每组最多15个字符）
 	}
 	//首页最新招标信息

jyBXBase/api/internal/logic/addSearchScreenLogic.go

@@ -48,9 +48,9 @@ func (l *AddSearchScreenLogic) AddSearchScreen(req *types.AddSearchScreen) (resp
 		NotKey:          req.Notkey,
 		InKey:           req.InKey,
 		AppId:           req.AppId,
-		SearchGroup:     req.SearchGroup,
-		SearchMode:      req.SearchMode,
-		WordsMode:       req.WordsMode,
+		SearchGroup:     int64(req.SearchGroup),
+		SearchMode:      int64(req.SearchMode),
+		WordsMode:       int64(req.WordsMode),
 		AdditionalWords: req.AdditionalWords,
 	})
 	if err0 != nil {

jyBXBase/api/internal/logic/checkSearchScreenLogic.go

@@ -47,9 +47,9 @@ func (l *CheckSearchScreenLogic) CheckSearchScreen(req *types.AddSearchScreen) (
 		FileExists:      req.FileExists,
 		NotKey:          req.Notkey,
 		AppId:           req.AppId,
-		SearchGroup:     req.SearchGroup,
-		SearchMode:      req.SearchMode,
-		WordsMode:       req.WordsMode,
+		SearchGroup:     int64(req.SearchGroup),
+		SearchMode:      int64(req.SearchMode),
+		WordsMode:       int64(req.WordsMode),
 		AdditionalWords: req.AdditionalWords,
 	})
 	if err0 != nil {

jyBXBase/api/internal/types/types.go

@@ -78,9 +78,9 @@ type AddSearchScreen struct {
 	FileExists      string `json:"fileExists,optional"` //附件
 	Notkey          string `json:"notkey,optional"`     //排除词 关键词：排除词（副：五组，每组最多15个字符）
 	InKey           string `json:"inkey,optional"`
-	SearchGroup     string `json:"searchGroup,optional"`     // 搜索分组：默认0：全部；1：招标采购公告；2：超前项目
-	SearchMode      string `json:"searchMode,optional"`      // 搜索模式：0：精准搜索；1：模糊搜索
-	WordsMode       string `json:"wordsMode,optional"`       // 搜索关键词模式；默认0：包含所有，1：包含任意
+	SearchGroup     int    `json:"searchGroup,optional"`     // 搜索分组：默认0：全部；1：招标采购公告；2：超前项目
+	SearchMode      int    `json:"searchMode,optional"`      // 搜索模式：0：精准搜索；1：模糊搜索
+	WordsMode       int    `json:"wordsMode,optional"`       // 搜索关键词模式；默认0：包含所有，1：包含任意
 	AdditionalWords string `json:"additionalWords,optional"` // 关键词：附加关键词（副：五组，每组最多15个字符）
 }
 

jyBXBase/rpc/bxbase.proto

@@ -136,9 +136,9 @@ message ListSearchRes{
   string id = 17;
   bool isPay = 18;
   string tabularflag = 19;
-  string  searchGroup = 20;//搜索分组：默认0：全部；1：招标采购公告；2：超前项目
-  string  searchMode = 21;//搜索模式：0：精准搜索；1：模糊搜索
-  string  wordsMode = 22;// 搜索关键词模式；默认0：包含所有，1：包含任意
+  int64  searchGroup = 20;//搜索分组：默认0：全部；1：招标采购公告；2：超前项目
+  int64  searchMode = 21;//搜索模式：0：精准搜索；1：模糊搜索
+  int64  wordsMode = 22;// 搜索关键词模式；默认0：包含所有，1：包含任意
   string additionalWords = 23;//关键词：附加关键词（副：五组，每组最多15个字符）
 }
 
@@ -161,9 +161,9 @@ message AddSearchReq{
   string city = 16;
   string inKey = 17;
   string appId = 18;
-  string  searchGroup = 19;//搜索分组：默认0：全部；1：招标采购公告；2：超前项目
-  string  searchMode = 20;//搜索模式：0：精准搜索；1：模糊搜索
-  string  wordsMode = 21;// 搜索关键词模式；默认0：包含所有，1：包含任意
+  int64  searchGroup = 19;//搜索分组：默认0：全部；1：招标采购公告；2：超前项目
+  int64  searchMode = 20;//搜索模式：0：精准搜索；1：模糊搜索
+  int64  wordsMode = 21;// 搜索关键词模式；默认0：包含所有，1：包含任意
   string additionalWords = 22;//关键词：附加关键词（副：五组，每组最多15个字符）
 }
 

jyBXBase/rpc/internal/logic/showsearchlogic.go

@@ -76,9 +76,9 @@ func (l *ShowSearchLogic) ShowSearch(in *bxbase.ShowSearchReq) (res *bxbase.Show
 			listSearch.FileExists = common.InterfaceToStr(vlu["file_exists"])
 			listSearch.Notkey = common.InterfaceToStr(vlu["not_key"])
 			listSearch.Tabularflag = common.InterfaceToStr(vlu["tabular_flag"])
-			listSearch.SearchGroup = common.InterfaceToStr(vlu["searchGroup"])
-			listSearch.SearchMode = common.InterfaceToStr(vlu["searchMode"])
-			listSearch.WordsMode = common.InterfaceToStr(vlu["wordsMode"])
+			listSearch.SearchGroup = common.Int64All(vlu["searchGroup"])
+			listSearch.SearchMode = common.Int64All(vlu["searchMode"])
+			listSearch.WordsMode = common.Int64All(vlu["wordsMode"])
 			listSearch.AdditionalWords = common.InterfaceToStr(vlu["additionalWords"])
 			//ppa,buyer,winner,agency
 			if SelectCheck(listSearch.SelectType, isOld) || listSearch.City != "" || listSearch.Notkey != "" ||

jyBXBase/rpc/type/bxbase/bxbase.pb.go

@@ -1338,9 +1338,9 @@ type ListSearchRes struct {
 	Id              string `protobuf:"bytes,17,opt,name=id,proto3" json:"id,omitempty"`
 	IsPay           bool   `protobuf:"varint,18,opt,name=isPay,proto3" json:"isPay,omitempty"`
 	Tabularflag     string `protobuf:"bytes,19,opt,name=tabularflag,proto3" json:"tabularflag,omitempty"`
-	SearchGroup     string `protobuf:"bytes,20,opt,name=searchGroup,proto3" json:"searchGroup,omitempty"`         //搜索分组：默认0：全部；1：招标采购公告；2：超前项目
-	SearchMode      string `protobuf:"bytes,21,opt,name=searchMode,proto3" json:"searchMode,omitempty"`           //搜索模式：0：精准搜索；1：模糊搜索
-	WordsMode       string `protobuf:"bytes,22,opt,name=wordsMode,proto3" json:"wordsMode,omitempty"`             // 搜索关键词模式；默认0：包含所有，1：包含任意
+	SearchGroup     int64  `protobuf:"varint,20,opt,name=searchGroup,proto3" json:"searchGroup,omitempty"`        //搜索分组：默认0：全部；1：招标采购公告；2：超前项目
+	SearchMode      int64  `protobuf:"varint,21,opt,name=searchMode,proto3" json:"searchMode,omitempty"`          //搜索模式：0：精准搜索；1：模糊搜索
+	WordsMode       int64  `protobuf:"varint,22,opt,name=wordsMode,proto3" json:"wordsMode,omitempty"`            // 搜索关键词模式；默认0：包含所有，1：包含任意
 	AdditionalWords string `protobuf:"bytes,23,opt,name=additionalWords,proto3" json:"additionalWords,omitempty"` //关键词：附加关键词（副：五组，每组最多15个字符）
 }
 
@@ -1509,25 +1509,25 @@ func (x *ListSearchRes) GetTabularflag() string {
 	return ""
 }
 
-func (x *ListSearchRes) GetSearchGroup() string {
+func (x *ListSearchRes) GetSearchGroup() int64 {
 	if x != nil {
 		return x.SearchGroup
 	}
-	return ""
+	return 0
 }
 
-func (x *ListSearchRes) GetSearchMode() string {
+func (x *ListSearchRes) GetSearchMode() int64 {
 	if x != nil {
 		return x.SearchMode
 	}
-	return ""
+	return 0
 }
 
-func (x *ListSearchRes) GetWordsMode() string {
+func (x *ListSearchRes) GetWordsMode() int64 {
 	if x != nil {
 		return x.WordsMode
 	}
-	return ""
+	return 0
 }
 
 func (x *ListSearchRes) GetAdditionalWords() string {
@@ -1560,9 +1560,9 @@ type AddSearchReq struct {
 	City            string `protobuf:"bytes,16,opt,name=city,proto3" json:"city,omitempty"`
 	InKey           string `protobuf:"bytes,17,opt,name=inKey,proto3" json:"inKey,omitempty"`
 	AppId           string `protobuf:"bytes,18,opt,name=appId,proto3" json:"appId,omitempty"`
-	SearchGroup     string `protobuf:"bytes,19,opt,name=searchGroup,proto3" json:"searchGroup,omitempty"`         //搜索分组：默认0：全部；1：招标采购公告；2：超前项目
-	SearchMode      string `protobuf:"bytes,20,opt,name=searchMode,proto3" json:"searchMode,omitempty"`           //搜索模式：0：精准搜索；1：模糊搜索
-	WordsMode       string `protobuf:"bytes,21,opt,name=wordsMode,proto3" json:"wordsMode,omitempty"`             // 搜索关键词模式；默认0：包含所有，1：包含任意
+	SearchGroup     int64  `protobuf:"varint,19,opt,name=searchGroup,proto3" json:"searchGroup,omitempty"`        //搜索分组：默认0：全部；1：招标采购公告；2：超前项目
+	SearchMode      int64  `protobuf:"varint,20,opt,name=searchMode,proto3" json:"searchMode,omitempty"`          //搜索模式：0：精准搜索；1：模糊搜索
+	WordsMode       int64  `protobuf:"varint,21,opt,name=wordsMode,proto3" json:"wordsMode,omitempty"`            // 搜索关键词模式；默认0：包含所有，1：包含任意
 	AdditionalWords string `protobuf:"bytes,22,opt,name=additionalWords,proto3" json:"additionalWords,omitempty"` //关键词：附加关键词（副：五组，每组最多15个字符）
 }
 
@@ -1724,25 +1724,25 @@ func (x *AddSearchReq) GetAppId() string {
 	return ""
 }
 
-func (x *AddSearchReq) GetSearchGroup() string {
+func (x *AddSearchReq) GetSearchGroup() int64 {
 	if x != nil {
 		return x.SearchGroup
 	}
-	return ""
+	return 0
 }
 
-func (x *AddSearchReq) GetSearchMode() string {
+func (x *AddSearchReq) GetSearchMode() int64 {
 	if x != nil {
 		return x.SearchMode
 	}
-	return ""
+	return 0
 }
 
-func (x *AddSearchReq) GetWordsMode() string {
+func (x *AddSearchReq) GetWordsMode() int64 {
 	if x != nil {
 		return x.WordsMode
 	}
-	return ""
+	return 0
 }
 
 func (x *AddSearchReq) GetAdditionalWords() string {
@@ -3035,11 +3035,11 @@ var file_bxbase_proto_rawDesc = []byte{
 	0x52, 0x05, 0x69, 0x73, 0x50, 0x61, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x61, 0x62, 0x75, 0x6c,
 	0x61, 0x72, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x74, 0x61,
 	0x62, 0x75, 0x6c, 0x61, 0x72, 0x66, 0x6c, 0x61, 0x67, 0x12, 0x20, 0x0a, 0x0b, 0x73, 0x65, 0x61,
-	0x72, 0x63, 0x68, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b,
+	0x72, 0x63, 0x68, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x14, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b,
 	0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x73,
-	0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x15, 0x20, 0x01, 0x28, 0x03, 0x52,
 	0x0a, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x77,
-	0x6f, 0x72, 0x64, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
+	0x6f, 0x72, 0x64, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09,
 	0x77, 0x6f, 0x72, 0x64, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x61, 0x64, 0x64,
 	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x18, 0x17, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x0f, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x57, 0x6f,
@@ -3076,11 +3076,11 @@ var file_bxbase_proto_rawDesc = []byte{
 	0x09, 0x52, 0x05, 0x69, 0x6e, 0x4b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49,
 	0x64, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x12, 0x20,
 	0x0a, 0x0b, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x13, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0b, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x72, 0x6f, 0x75, 0x70,
+	0x01, 0x28, 0x03, 0x52, 0x0b, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x47, 0x72, 0x6f, 0x75, 0x70,
 	0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x14,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x6f, 0x64, 0x65,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4d, 0x6f, 0x64, 0x65,
 	0x12, 0x1c, 0x0a, 0x09, 0x77, 0x6f, 0x72, 0x64, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x15, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x09, 0x77, 0x6f, 0x72, 0x64, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x28,
+	0x01, 0x28, 0x03, 0x52, 0x09, 0x77, 0x6f, 0x72, 0x64, 0x73, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x28,
 	0x0a, 0x0f, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x61, 0x6c, 0x57, 0x6f, 0x72, 0x64,
 	0x73, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x61, 0x64, 0x64, 0x69, 0x74, 0x69, 0x6f,
 	0x6e, 0x61, 0x6c, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x22, 0x4c, 0x0a, 0x0c, 0x44, 0x65, 0x6c, 0x53,