Selaa lähdekoodia

wip:发布平台

wangshan 9 kuukautta sitten
vanhempi
commit
f08b11e247

+ 1 - 0
jyBXCore/rpc/bxcore.proto

@@ -718,6 +718,7 @@ message  PurchaseList {
   int64 bidOpenTime = 21;//开标时间
   int64 signEndTime = 22;//报名截止时间
   int64 bidEndTime = 23;//投标截止时间
+  string publicType = 24;//发布平台
 }
 //
 service BxCore {

+ 12 - 16
jyBXCore/rpc/service/purchase.go

@@ -188,15 +188,10 @@ func (p *Purchase) PurchaseListFormat(res []map[string]interface{}) (list []*bxc
 			buyerTel = MC.InterfaceToStr(rv["buyertel"])
 		}
 		isValidFile, _ := rv["isValidFile"].(bool)
-		buyerPerson := MC.InterfaceToStr(rv["buyerperson"])
-		agency := MC.InterfaceToStr(rv["agency"])
-		agencyTel := MC.InterfaceToStr(rv["agencytel"])
-		agencyPerson := MC.InterfaceToStr(rv["agencyperson"])
-		//s_winner := MC.InterfaceToStr(rv["s_winner"])
-		//winnertel := MC.InterfaceToStr(rv["winnertel"])
-		//winnerperson := MC.InterfaceToStr(rv["winnerperson"])
-		//entidlist := MC.InterfaceToStr(rv["entidlist"])
-		//projectinfo := MC.InterfaceToStr(rv["projectinfo"])
+		//buyerPerson := MC.InterfaceToStr(rv["buyerperson"])
+		//agency := MC.InterfaceToStr(rv["agency"])
+		//agencyTel := MC.InterfaceToStr(rv["agencytel"])
+		//agencyPerson := MC.InterfaceToStr(rv["agencyperson"])
 		//中标信息
 		var winnerInfo []*bxcore.WinnerInfo
 		winnerList := MC.ObjToString(rv["s_winner"]) //中标企业名称集合
@@ -240,13 +235,14 @@ func (p *Purchase) PurchaseListFormat(res []map[string]interface{}) (list []*bxc
 			DeadlineTime: signEndTime,
 			DeliveryLoc:  deliveryLoc,
 			Industry:     util.IndustryFormat(p.Industry, strings.Trim(MC.ObjToString(rv["s_subscopeclass"]), ",")),
-			BuyerPerson:  buyerPerson,
-			Agency:       agency,
-			AgencyTel:    agencyTel,
-			AgencyPerson: agencyPerson,
-			WinnerInfo:   winnerInfo,
-			BidEndTime:   MC.Int64All(rv["bidendtime"]),
-			BidOpenTime:  MC.Int64All(rv["bidopentime"]), //开标时间,
+			PublicType:   MC.InterfaceToStr(rv["public_type"]),
+			//BuyerPerson:  buyerPerson,
+			//Agency:       agency,
+			//AgencyTel:    agencyTel,
+			//AgencyPerson: agencyPerson,
+			//WinnerInfo:   winnerInfo,
+			//BidEndTime:   MC.Int64All(rv["bidendtime"]),
+			//BidOpenTime:  MC.Int64All(rv["bidopentime"]), //开标时间,
 		})
 	}
 	return

+ 11 - 1
jyBXCore/rpc/type/bxcore/bxcore.pb.go

@@ -6582,6 +6582,7 @@ type PurchaseList struct {
 	BidOpenTime  int64         `protobuf:"varint,21,opt,name=bidOpenTime,proto3" json:"bidOpenTime,omitempty"`  //开标时间
 	SignEndTime  int64         `protobuf:"varint,22,opt,name=signEndTime,proto3" json:"signEndTime,omitempty"`  //报名截止时间
 	BidEndTime   int64         `protobuf:"varint,23,opt,name=bidEndTime,proto3" json:"bidEndTime,omitempty"`    //投标截止时间
+	PublicType   string        `protobuf:"bytes,24,opt,name=publicType,proto3" json:"publicType,omitempty"`     //发布平台
 }
 
 func (x *PurchaseList) Reset() {
@@ -6777,6 +6778,13 @@ func (x *PurchaseList) GetBidEndTime() int64 {
 	return 0
 }
 
+func (x *PurchaseList) GetPublicType() string {
+	if x != nil {
+		return x.PublicType
+	}
+	return ""
+}
+
 var File_bxcore_proto protoreflect.FileDescriptor
 
 var file_bxcore_proto_rawDesc = []byte{
@@ -7818,7 +7826,7 @@ var file_bxcore_proto_rawDesc = []byte{
 	0x69, 0x67, 0x68, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x57, 0x6f, 0x72, 0x64, 0x73, 0x12, 0x28, 0x0a,
 	0x04, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x62, 0x78,
 	0x63, 0x6f, 0x72, 0x65, 0x2e, 0x50, 0x75, 0x72, 0x63, 0x68, 0x61, 0x73, 0x65, 0x4c, 0x69, 0x73,
-	0x74, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0xb6, 0x05, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x63,
+	0x74, 0x52, 0x04, 0x6c, 0x69, 0x73, 0x74, 0x22, 0xd6, 0x05, 0x0a, 0x0c, 0x50, 0x75, 0x72, 0x63,
 	0x68, 0x61, 0x73, 0x65, 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, 0x12, 0x0a, 0x04,
@@ -7862,6 +7870,8 @@ var file_bxcore_proto_rawDesc = []byte{
 	0x01, 0x28, 0x03, 0x52, 0x0b, 0x73, 0x69, 0x67, 0x6e, 0x45, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65,
 	0x12, 0x1e, 0x0a, 0x0a, 0x62, 0x69, 0x64, 0x45, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x17,
 	0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x62, 0x69, 0x64, 0x45, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65,
+	0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x54, 0x79, 0x70, 0x65, 0x18, 0x18,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x70, 0x75, 0x62, 0x6c, 0x69, 0x63, 0x54, 0x79, 0x70, 0x65,
 	0x32, 0xc1, 0x0a, 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,