wip:截止时间戳

jyBXCore/rpc/bxcore.proto

@@ -707,7 +707,7 @@ message  PurchaseList {
   int64  price = 10;//预算 or 中标金额
   string buyer = 11;//采购单位
   string buyerTel = 12;//采购单位联系电话
-  string deadlineTime = 13;//报名截止时间-展示年月日时分，例如：2024-10-01 10:00
+  int64 deadlineTime = 13;//报名截止时间
   string deliveryLoc = 14;//交付地点
   string industry = 15;//行业标签
   string buyerPerson = 16;//采购单位联系人

jyBXCore/rpc/etc/bxcore.yaml

@@ -82,4 +82,4 @@ SearchWinner:
   Switch: true
   RegWinner: ".+[司院厂所心处普行]$"
 PurchaseCode: ygzc_cgxx
-PurchaseDiffSwitch: true
+PurchaseDiffSwitch: false

jyBXCore/rpc/service/purchase.go

@@ -2,7 +2,6 @@ package service
 
 import (
 	MC "app.yhyue.com/moapp/jybase/common"
-	"app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/encrypt"
 	elastic "app.yhyue.com/moapp/jybase/es"
 	"app.yhyue.com/moapp/jybase/redis"
@@ -175,10 +174,6 @@ func (p *Purchase) PurchaseListFormat(res []map[string]interface{}) (list []*bxc
 		if bidAmount, ok := rv["bidamount"].(float64); ok && bidAmount > 0 { //中标金额
 			price = int64(bidAmount)
 		}
-		signEndTime := "" //报名截止时间
-		if set := MC.Int64All(rv["signendtime"]); set > 0 {
-			signEndTime = date.FormatDateByInt64(&set, "2006-01-02 15:04")
-		}
 		//deliver_area  交付省份//deliver_city  交付城市//deliver_district  交付区县
 		deliveryLoc := fmt.Sprintf("%s%s%s", MC.InterfaceToStr(rv["deliver_area"]), MC.InterfaceToStr(rv["deliver_city"]), MC.InterfaceToStr(rv["deliver_district"]))
 		buyer := noPower
@@ -232,7 +227,7 @@ func (p *Purchase) PurchaseListFormat(res []map[string]interface{}) (list []*bxc
 			Price:        price,
 			Buyer:        buyer,
 			BuyerTel:     buyerTel,
-			DeadlineTime: signEndTime,
+			DeadlineTime: MC.Int64All(rv["signendtime"]), //报名截止时间
 			DeliveryLoc:  deliveryLoc,
 			Industry:     util.IndustryFormat(p.Industry, strings.Trim(MC.ObjToString(rv["s_subscopeclass"]), ",")),
 			PublicType:   MC.InterfaceToStr(rv["public_type"]),

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

@@ -6559,30 +6559,30 @@ type PurchaseList struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id           string        `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`                      //信息id
-	Area         string        `protobuf:"bytes,2,opt,name=area,proto3" json:"area,omitempty"`                  //地区
-	City         string        `protobuf:"bytes,3,opt,name=city,proto3" json:"city,omitempty"`                  //城市
-	District     string        `protobuf:"bytes,4,opt,name=district,proto3" json:"district,omitempty"`          // 区县
-	RegionUrl    string        `protobuf:"bytes,5,opt,name=regionUrl,proto3" json:"regionUrl,omitempty"`        //地区标签地址
-	BuyerClass   string        `protobuf:"bytes,6,opt,name=buyerClass,proto3" json:"buyerClass,omitempty"`      //采购单位类型
-	PublishTime  int64         `protobuf:"varint,7,opt,name=publishTime,proto3" json:"publishTime,omitempty"`   //发布时间
-	FileExists   bool          `protobuf:"varint,8,opt,name=fileExists,proto3" json:"fileExists,omitempty"`     //是否有附件
-	Title        string        `protobuf:"bytes,9,opt,name=title,proto3" json:"title,omitempty"`                //标题
-	Price        int64         `protobuf:"varint,10,opt,name=price,proto3" json:"price,omitempty"`              //预算 or 中标金额
-	Buyer        string        `protobuf:"bytes,11,opt,name=buyer,proto3" json:"buyer,omitempty"`               //采购单位
-	BuyerTel     string        `protobuf:"bytes,12,opt,name=buyerTel,proto3" json:"buyerTel,omitempty"`         //采购单位联系电话
-	DeadlineTime string        `protobuf:"bytes,13,opt,name=deadlineTime,proto3" json:"deadlineTime,omitempty"` //报名截止时间-展示年月日时分，例如：2024-10-01 10:00
-	DeliveryLoc  string        `protobuf:"bytes,14,opt,name=deliveryLoc,proto3" json:"deliveryLoc,omitempty"`   //交付地点
-	Industry     string        `protobuf:"bytes,15,opt,name=industry,proto3" json:"industry,omitempty"`         //行业标签
-	BuyerPerson  string        `protobuf:"bytes,16,opt,name=buyerPerson,proto3" json:"buyerPerson,omitempty"`   //采购单位联系人
-	Agency       string        `protobuf:"bytes,17,opt,name=agency,proto3" json:"agency,omitempty"`             //代理机构
-	AgencyPerson string        `protobuf:"bytes,18,opt,name=agencyPerson,proto3" json:"agencyPerson,omitempty"` //代理机构联系人
-	AgencyTel    string        `protobuf:"bytes,19,opt,name=agencyTel,proto3" json:"agencyTel,omitempty"`       //代理机构联系电话
-	WinnerInfo   []*WinnerInfo `protobuf:"bytes,20,rep,name=winnerInfo,proto3" json:"winnerInfo,omitempty"`     //中标企业信息
-	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"`     //发布平台
+	Id           string        `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`                       //信息id
+	Area         string        `protobuf:"bytes,2,opt,name=area,proto3" json:"area,omitempty"`                   //地区
+	City         string        `protobuf:"bytes,3,opt,name=city,proto3" json:"city,omitempty"`                   //城市
+	District     string        `protobuf:"bytes,4,opt,name=district,proto3" json:"district,omitempty"`           // 区县
+	RegionUrl    string        `protobuf:"bytes,5,opt,name=regionUrl,proto3" json:"regionUrl,omitempty"`         //地区标签地址
+	BuyerClass   string        `protobuf:"bytes,6,opt,name=buyerClass,proto3" json:"buyerClass,omitempty"`       //采购单位类型
+	PublishTime  int64         `protobuf:"varint,7,opt,name=publishTime,proto3" json:"publishTime,omitempty"`    //发布时间
+	FileExists   bool          `protobuf:"varint,8,opt,name=fileExists,proto3" json:"fileExists,omitempty"`      //是否有附件
+	Title        string        `protobuf:"bytes,9,opt,name=title,proto3" json:"title,omitempty"`                 //标题
+	Price        int64         `protobuf:"varint,10,opt,name=price,proto3" json:"price,omitempty"`               //预算 or 中标金额
+	Buyer        string        `protobuf:"bytes,11,opt,name=buyer,proto3" json:"buyer,omitempty"`                //采购单位
+	BuyerTel     string        `protobuf:"bytes,12,opt,name=buyerTel,proto3" json:"buyerTel,omitempty"`          //采购单位联系电话
+	DeadlineTime int64         `protobuf:"varint,13,opt,name=deadlineTime,proto3" json:"deadlineTime,omitempty"` //报名截止时间
+	DeliveryLoc  string        `protobuf:"bytes,14,opt,name=deliveryLoc,proto3" json:"deliveryLoc,omitempty"`    //交付地点
+	Industry     string        `protobuf:"bytes,15,opt,name=industry,proto3" json:"industry,omitempty"`          //行业标签
+	BuyerPerson  string        `protobuf:"bytes,16,opt,name=buyerPerson,proto3" json:"buyerPerson,omitempty"`    //采购单位联系人
+	Agency       string        `protobuf:"bytes,17,opt,name=agency,proto3" json:"agency,omitempty"`              //代理机构
+	AgencyPerson string        `protobuf:"bytes,18,opt,name=agencyPerson,proto3" json:"agencyPerson,omitempty"`  //代理机构联系人
+	AgencyTel    string        `protobuf:"bytes,19,opt,name=agencyTel,proto3" json:"agencyTel,omitempty"`        //代理机构联系电话
+	WinnerInfo   []*WinnerInfo `protobuf:"bytes,20,rep,name=winnerInfo,proto3" json:"winnerInfo,omitempty"`      //中标企业信息
+	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() {
@@ -6701,11 +6701,11 @@ func (x *PurchaseList) GetBuyerTel() string {
 	return ""
 }
 
-func (x *PurchaseList) GetDeadlineTime() string {
+func (x *PurchaseList) GetDeadlineTime() int64 {
 	if x != nil {
 		return x.DeadlineTime
 	}
-	return ""
+	return 0
 }
 
 func (x *PurchaseList) GetDeliveryLoc() string {
@@ -7847,7 +7847,7 @@ var file_bxcore_proto_rawDesc = []byte{
 	0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x62, 0x75, 0x79, 0x65, 0x72, 0x12, 0x1a,
 	0x0a, 0x08, 0x62, 0x75, 0x79, 0x65, 0x72, 0x54, 0x65, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09,
 	0x52, 0x08, 0x62, 0x75, 0x79, 0x65, 0x72, 0x54, 0x65, 0x6c, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x65,
-	0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09,
+	0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x03,
 	0x52, 0x0c, 0x64, 0x65, 0x61, 0x64, 0x6c, 0x69, 0x6e, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x20,
 	0x0a, 0x0b, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x4c, 0x6f, 0x63, 0x18, 0x0e, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x6c, 0x69, 0x76, 0x65, 0x72, 0x79, 0x4c, 0x6f, 0x63,