wangshan před 3 roky
rodič
revize
ff202e66ef

+ 12 - 1
jyBXCore/rpc/bxcore.proto

@@ -60,8 +60,19 @@ message  SearchList {
   int64 bidamount = 15;//中标金额
   int64  budget = 16;//预算
   string projectName = 17;//项目名称
+  string  buyer = 18;//采购单位
+  string winner = 19;//中标企业
+  int64 bidopentime = 20;//开标时间
+  PInfo projectInfo = 21;//拟建项目信息
+  string projectCode = 22;//项目代码
+}
+//
+message PInfo {
+  string approveCode =1;
+  string approveContent = 2;
+  string approveDept = 3;
+  string approveStatus = 4 ;
 }
-
 //
 message SearchLimitReq {
   string appid = 1;

+ 1 - 0
jyBXCore/rpc/bxcore/bxcore.go

@@ -13,6 +13,7 @@ import (
 )
 
 type (
+	PInfo           = bxcore.PInfo
 	SearchData      = bxcore.SearchData
 	SearchLimitReq  = bxcore.SearchLimitReq
 	SearchLimitResp = bxcore.SearchLimitResp

+ 198 - 53
jyBXCore/rpc/type/bxcore/bxcore.pb.go

@@ -409,9 +409,14 @@ type SearchList struct {
 	FileExists  bool   `protobuf:"varint,12,opt,name=fileExists,proto3" json:"fileExists,omitempty"`
 	Title       string `protobuf:"bytes,13,opt,name=title,proto3" json:"title,omitempty"`
 	IsCollected bool   `protobuf:"varint,14,opt,name=isCollected,proto3" json:"isCollected,omitempty"`
-	Bidamount   int64  `protobuf:"varint,15,opt,name=bidamount,proto3" json:"bidamount,omitempty"`    //中标金额
-	Budget      int64  `protobuf:"varint,16,opt,name=budget,proto3" json:"budget,omitempty"`          //预算
-	ProjectName string `protobuf:"bytes,17,opt,name=projectName,proto3" json:"projectName,omitempty"` //项目名称
+	Bidamount   int64  `protobuf:"varint,15,opt,name=bidamount,proto3" json:"bidamount,omitempty"`     //中标金额
+	Budget      int64  `protobuf:"varint,16,opt,name=budget,proto3" json:"budget,omitempty"`           //预算
+	ProjectName string `protobuf:"bytes,17,opt,name=projectName,proto3" json:"projectName,omitempty"`  //项目名称
+	Buyer       string `protobuf:"bytes,18,opt,name=buyer,proto3" json:"buyer,omitempty"`              //采购单位
+	Winner      string `protobuf:"bytes,19,opt,name=winner,proto3" json:"winner,omitempty"`            //中标企业
+	Bidopentime int64  `protobuf:"varint,20,opt,name=bidopentime,proto3" json:"bidopentime,omitempty"` //开标时间
+	ProjectInfo *PInfo `protobuf:"bytes,21,opt,name=projectInfo,proto3" json:"projectInfo,omitempty"`  //拟建项目信息
+	ProjectCode string `protobuf:"bytes,22,opt,name=projectCode,proto3" json:"projectCode,omitempty"`  //项目代码
 }
 
 func (x *SearchList) Reset() {
@@ -565,6 +570,113 @@ func (x *SearchList) GetProjectName() string {
 	return ""
 }
 
+func (x *SearchList) GetBuyer() string {
+	if x != nil {
+		return x.Buyer
+	}
+	return ""
+}
+
+func (x *SearchList) GetWinner() string {
+	if x != nil {
+		return x.Winner
+	}
+	return ""
+}
+
+func (x *SearchList) GetBidopentime() int64 {
+	if x != nil {
+		return x.Bidopentime
+	}
+	return 0
+}
+
+func (x *SearchList) GetProjectInfo() *PInfo {
+	if x != nil {
+		return x.ProjectInfo
+	}
+	return nil
+}
+
+func (x *SearchList) GetProjectCode() string {
+	if x != nil {
+		return x.ProjectCode
+	}
+	return ""
+}
+
+//
+type PInfo struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ApproveCode    string `protobuf:"bytes,1,opt,name=approveCode,proto3" json:"approveCode,omitempty"`
+	ApproveContent string `protobuf:"bytes,2,opt,name=approveContent,proto3" json:"approveContent,omitempty"`
+	ApproveDept    string `protobuf:"bytes,3,opt,name=approveDept,proto3" json:"approveDept,omitempty"`
+	ApproveStatus  string `protobuf:"bytes,4,opt,name=approveStatus,proto3" json:"approveStatus,omitempty"`
+}
+
+func (x *PInfo) Reset() {
+	*x = PInfo{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_bxcore_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *PInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*PInfo) ProtoMessage() {}
+
+func (x *PInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_bxcore_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use PInfo.ProtoReflect.Descriptor instead.
+func (*PInfo) Descriptor() ([]byte, []int) {
+	return file_bxcore_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *PInfo) GetApproveCode() string {
+	if x != nil {
+		return x.ApproveCode
+	}
+	return ""
+}
+
+func (x *PInfo) GetApproveContent() string {
+	if x != nil {
+		return x.ApproveContent
+	}
+	return ""
+}
+
+func (x *PInfo) GetApproveDept() string {
+	if x != nil {
+		return x.ApproveDept
+	}
+	return ""
+}
+
+func (x *PInfo) GetApproveStatus() string {
+	if x != nil {
+		return x.ApproveStatus
+	}
+	return ""
+}
+
 //
 type SearchLimitReq struct {
 	state         protoimpl.MessageState
@@ -583,7 +695,7 @@ type SearchLimitReq struct {
 func (x *SearchLimitReq) Reset() {
 	*x = SearchLimitReq{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcore_proto_msgTypes[4]
+		mi := &file_bxcore_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -596,7 +708,7 @@ func (x *SearchLimitReq) String() string {
 func (*SearchLimitReq) ProtoMessage() {}
 
 func (x *SearchLimitReq) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcore_proto_msgTypes[4]
+	mi := &file_bxcore_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -609,7 +721,7 @@ func (x *SearchLimitReq) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SearchLimitReq.ProtoReflect.Descriptor instead.
 func (*SearchLimitReq) Descriptor() ([]byte, []int) {
-	return file_bxcore_proto_rawDescGZIP(), []int{4}
+	return file_bxcore_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *SearchLimitReq) GetAppid() string {
@@ -675,7 +787,7 @@ type SearchLimitResp struct {
 func (x *SearchLimitResp) Reset() {
 	*x = SearchLimitResp{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_bxcore_proto_msgTypes[5]
+		mi := &file_bxcore_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -688,7 +800,7 @@ func (x *SearchLimitResp) String() string {
 func (*SearchLimitResp) ProtoMessage() {}
 
 func (x *SearchLimitResp) ProtoReflect() protoreflect.Message {
-	mi := &file_bxcore_proto_msgTypes[5]
+	mi := &file_bxcore_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -701,7 +813,7 @@ func (x *SearchLimitResp) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SearchLimitResp.ProtoReflect.Descriptor instead.
 func (*SearchLimitResp) Descriptor() ([]byte, []int) {
-	return file_bxcore_proto_rawDescGZIP(), []int{5}
+	return file_bxcore_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *SearchLimitResp) GetErrCode() int64 {
@@ -788,7 +900,7 @@ var file_bxcore_proto_rawDesc = []byte{
 	0x65, 0x61, 0x72, 0x63, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x73, 0x65, 0x63,
 	0x6f, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x6f, 0x74,
 	0x61, 0x6c, 0x50, 0x61, 0x67, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x6f,
-	0x74, 0x61, 0x6c, 0x50, 0x61, 0x67, 0x65, 0x22, 0xe0, 0x03, 0x0a, 0x0a, 0x53, 0x65, 0x61, 0x72,
+	0x74, 0x61, 0x6c, 0x50, 0x61, 0x67, 0x65, 0x22, 0x83, 0x05, 0x0a, 0x0a, 0x53, 0x65, 0x61, 0x72,
 	0x63, 0x68, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x65, 0x61, 0x18, 0x02,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x61, 0x72, 0x65, 0x61, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x72,
@@ -818,35 +930,54 @@ var file_bxcore_proto_rawDesc = []byte{
 	0x12, 0x16, 0x0a, 0x06, 0x62, 0x75, 0x64, 0x67, 0x65, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x03,
 	0x52, 0x06, 0x62, 0x75, 0x64, 0x67, 0x65, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x72, 0x6f, 0x6a,
 	0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x70,
-	0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xc2, 0x01, 0x0a, 0x0e, 0x53,
-	0x65, 0x61, 0x72, 0x63, 0x68, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a,
-	0x05, 0x61, 0x70, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70,
-	0x70, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x12, 0x14, 0x0a,
-	0x05, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x63, 0x65,
-	0x6e, 0x74, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x65, 0x72,
-	0x63, 0x65, 0x6e, 0x74, 0x61, 0x67, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49,
-	0x64, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12,
-	0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x22,
-	0x59, 0x0a, 0x0f, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a,
-	0x07, 0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x32, 0x80, 0x01, 0x0a, 0x06, 0x42,
-	0x78, 0x43, 0x6f, 0x72, 0x65, 0x12, 0x36, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x53, 0x65, 0x61, 0x72,
-	0x63, 0x68, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x11, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e, 0x62, 0x78, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3e, 0x0a,
-	0x0b, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x16, 0x2e, 0x62,
-	0x78, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4c, 0x69, 0x6d, 0x69,
-	0x74, 0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x65,
-	0x61, 0x72, 0x63, 0x68, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x42, 0x0a, 0x5a,
-	0x08, 0x2e, 0x2f, 0x62, 0x78, 0x63, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
+	0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x75,
+	0x79, 0x65, 0x72, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x75, 0x79, 0x65, 0x72,
+	0x12, 0x16, 0x0a, 0x06, 0x77, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x06, 0x77, 0x69, 0x6e, 0x6e, 0x65, 0x72, 0x12, 0x20, 0x0a, 0x0b, 0x62, 0x69, 0x64, 0x6f,
+	0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x14, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x62,
+	0x69, 0x64, 0x6f, 0x70, 0x65, 0x6e, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2f, 0x0a, 0x0b, 0x70, 0x72,
+	0x6f, 0x6a, 0x65, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x0d, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0b,
+	0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x70,
+	0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x16, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0b, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x22, 0x99, 0x01,
+	0x0a, 0x05, 0x50, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x70, 0x70, 0x72, 0x6f,
+	0x76, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x70,
+	0x70, 0x72, 0x6f, 0x76, 0x65, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x61, 0x70, 0x70,
+	0x72, 0x6f, 0x76, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0e, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e,
+	0x74, 0x12, 0x20, 0x0a, 0x0b, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x44, 0x65, 0x70, 0x74,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x44,
+	0x65, 0x70, 0x74, 0x12, 0x24, 0x0a, 0x0d, 0x61, 0x70, 0x70, 0x72, 0x6f, 0x76, 0x65, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x61, 0x70, 0x70, 0x72,
+	0x6f, 0x76, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0xc2, 0x01, 0x0a, 0x0e, 0x53, 0x65,
+	0x61, 0x72, 0x63, 0x68, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05,
+	0x61, 0x70, 0x70, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70,
+	0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x07, 0x74, 0x69, 0x6d, 0x65, 0x4f, 0x75, 0x74, 0x12, 0x14, 0x0a, 0x05,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x6f, 0x75,
+	0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x65, 0x72, 0x63, 0x65, 0x6e,
+	0x74, 0x61, 0x67, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x70, 0x65, 0x72, 0x63,
+	0x65, 0x6e, 0x74, 0x61, 0x67, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64,
+	0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x12, 0x1e,
+	0x0a, 0x0a, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0a, 0x73, 0x65, 0x61, 0x72, 0x63, 0x68, 0x54, 0x79, 0x70, 0x65, 0x22, 0x59,
+	0x0a, 0x0f, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x19, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x5f, 0x63, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x72, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x17, 0x0a, 0x07,
+	0x65, 0x72, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65,
+	0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x32, 0x80, 0x01, 0x0a, 0x06, 0x42, 0x78,
+	0x43, 0x6f, 0x72, 0x65, 0x12, 0x36, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x53, 0x65, 0x61, 0x72, 0x63,
+	0x68, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x11, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x53,
+	0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x72,
+	0x65, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x3e, 0x0a, 0x0b,
+	0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x16, 0x2e, 0x62, 0x78,
+	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4c, 0x69, 0x6d, 0x69, 0x74,
+	0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x62, 0x78, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x53, 0x65, 0x61,
+	0x72, 0x63, 0x68, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x42, 0x0a, 0x5a, 0x08,
+	0x2e, 0x2f, 0x62, 0x78, 0x63, 0x6f, 0x72, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -861,27 +992,29 @@ func file_bxcore_proto_rawDescGZIP() []byte {
 	return file_bxcore_proto_rawDescData
 }
 
-var file_bxcore_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_bxcore_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
 var file_bxcore_proto_goTypes = []interface{}{
 	(*SearchReq)(nil),       // 0: bxcore.SearchReq
 	(*SearchResp)(nil),      // 1: bxcore.SearchResp
 	(*SearchData)(nil),      // 2: bxcore.SearchData
 	(*SearchList)(nil),      // 3: bxcore.SearchList
-	(*SearchLimitReq)(nil),  // 4: bxcore.SearchLimitReq
-	(*SearchLimitResp)(nil), // 5: bxcore.SearchLimitResp
+	(*PInfo)(nil),           // 4: bxcore.PInfo
+	(*SearchLimitReq)(nil),  // 5: bxcore.SearchLimitReq
+	(*SearchLimitResp)(nil), // 6: bxcore.SearchLimitResp
 }
 var file_bxcore_proto_depIdxs = []int32{
 	2, // 0: bxcore.SearchResp.data:type_name -> bxcore.SearchData
 	3, // 1: bxcore.SearchData.list:type_name -> bxcore.SearchList
-	0, // 2: bxcore.BxCore.GetSearchList:input_type -> bxcore.SearchReq
-	4, // 3: bxcore.BxCore.SearchLimit:input_type -> bxcore.SearchLimitReq
-	1, // 4: bxcore.BxCore.GetSearchList:output_type -> bxcore.SearchResp
-	5, // 5: bxcore.BxCore.SearchLimit:output_type -> bxcore.SearchLimitResp
-	4, // [4:6] is the sub-list for method output_type
-	2, // [2:4] is the sub-list for method input_type
-	2, // [2:2] is the sub-list for extension type_name
-	2, // [2:2] is the sub-list for extension extendee
-	0, // [0:2] is the sub-list for field type_name
+	4, // 2: bxcore.SearchList.projectInfo:type_name -> bxcore.PInfo
+	0, // 3: bxcore.BxCore.GetSearchList:input_type -> bxcore.SearchReq
+	5, // 4: bxcore.BxCore.SearchLimit:input_type -> bxcore.SearchLimitReq
+	1, // 5: bxcore.BxCore.GetSearchList:output_type -> bxcore.SearchResp
+	6, // 6: bxcore.BxCore.SearchLimit:output_type -> bxcore.SearchLimitResp
+	5, // [5:7] is the sub-list for method output_type
+	3, // [3:5] is the sub-list for method input_type
+	3, // [3:3] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
 }
 
 func init() { file_bxcore_proto_init() }
@@ -939,7 +1072,7 @@ func file_bxcore_proto_init() {
 			}
 		}
 		file_bxcore_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SearchLimitReq); i {
+			switch v := v.(*PInfo); i {
 			case 0:
 				return &v.state
 			case 1:
@@ -951,6 +1084,18 @@ func file_bxcore_proto_init() {
 			}
 		}
 		file_bxcore_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SearchLimitReq); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_bxcore_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SearchLimitResp); i {
 			case 0:
 				return &v.state
@@ -969,7 +1114,7 @@ func file_bxcore_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_bxcore_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   6,
+			NumMessages:   7,
 			NumExtensions: 0,
 			NumServices:   1,
 		},

+ 28 - 1
jyBXCore/rpc/util/search.go

@@ -180,7 +180,7 @@ func GetBidSearchData(in *bxcore.SearchReq) (count int64, list []*bxcore.SearchL
 	}
 	if count > 0 || start > 1 {
 		field := bidSearch_field_1
-		if start == 1 {
+		if start == 0 {
 			field = bidSearch_field
 		}
 		var repl *[]map[string]interface{}
@@ -216,6 +216,18 @@ func GetBidSearchData(in *bxcore.SearchReq) (count int64, list []*bxcore.SearchL
 				searchList.Budget = MC.Int64All(v["budget"])
 				searchList.Bidamount = MC.Int64All(v["bidamount"])
 				searchList.ProjectName = MC.ObjToString(v["projectname"])
+				searchList.ProjectCode = MC.ObjToString(v["projectcode"])
+				searchList.ProjectInfo = &bxcore.PInfo{}
+				if v["projectinfo"] != nil {
+					pinfo := MC.ObjToMap(v["projectinfo"])
+					searchList.ProjectInfo.ApproveCode = MC.ObjToString((*pinfo)["approvecode"])
+					searchList.ProjectInfo.ApproveContent = MC.ObjToString((*pinfo)["approvecontent"])
+					searchList.ProjectInfo.ApproveDept = MC.ObjToString((*pinfo)["approvedept"])
+					searchList.ProjectInfo.ApproveStatus = MC.ObjToString((*pinfo)["approvestatus"])
+				}
+				searchList.Winner = MC.ObjToString(v["winner"])
+				searchList.Buyer = MC.ObjToString(v["buyer"])
+				searchList.Bidopentime = MC.Int64All(v["bidopentime"])
 				list = append(list, searchList)
 			}
 		}
@@ -577,6 +589,21 @@ func SearchCahcheData(in *bxcore.SearchReq) (count int64, list []*bxcore.SearchL
 				searchList.Subtype = MC.ObjToString(v["subtype"])
 				searchList.SubtypeUrl = IC.LabelMap[searchList.Subtype].Url
 				searchList.Title = MC.ObjToString(v["title"])
+				searchList.Budget = MC.Int64All(v["budget"])
+				searchList.Bidamount = MC.Int64All(v["bidamount"])
+				searchList.ProjectName = MC.ObjToString(v["projectname"])
+				searchList.ProjectCode = MC.ObjToString(v["projectcode"])
+				searchList.ProjectInfo = &bxcore.PInfo{}
+				if v["projectinfo"] != nil {
+					pinfo := MC.ObjToMap(v["projectinfo"])
+					searchList.ProjectInfo.ApproveCode = MC.ObjToString((*pinfo)["approvecode"])
+					searchList.ProjectInfo.ApproveContent = MC.ObjToString((*pinfo)["approvecontent"])
+					searchList.ProjectInfo.ApproveDept = MC.ObjToString((*pinfo)["approvedept"])
+					searchList.ProjectInfo.ApproveStatus = MC.ObjToString((*pinfo)["approvestatus"])
+				}
+				searchList.Winner = MC.ObjToString(v["winner"])
+				searchList.Buyer = MC.ObjToString(v["buyer"])
+				searchList.Bidopentime = MC.Int64All(v["bidopentime"])
 				list = append(list, searchList)
 			}
 		}