feat:参标列表时间字段调整为int类型

jyBXCore/rpc/bxcore.proto

@@ -398,10 +398,10 @@ message  ParticipateList{
   string buyer = 3;//采购单位
   string budget = 4;//预算
   string participants = 5;//参标人 多个,号隔开
-  string bidTime = 6;//招标日期
-  string bidEndTime = 7;//投标截止日期
-  string bidOpenTime = 8;//投标截止日期
-  string updateStatusTime = 9;//更新状态时间
+  int64 bidTime = 6;//招标日期
+  int64 bidEndTime = 7;//投标截止日期
+  int64 bidOpenTime = 8;//投标截止日期
+  int64 updateStatusTime = 9;//更新状态时间
   string updateStatusCon = 10;//投标状态更新
 }
 message  ParticipateData{

jyBXCore/rpc/model/mysql/participateBid.go

@@ -602,15 +602,38 @@ func SingleParticipateList(in *bxcore.ParticipateListReq, conditionSql string) (
 		list := IC.BaseMysql.SelectBySql(listSql, in.PositionId)
 		if list != nil && len(*list) > 0 {
 			for _, v := range *list {
+				bidTimeStr := MC.ObjToString(v["bid_time"])
+				bidEndTimeStr := MC.ObjToString(v["bid_end_time"])
+				bidOpenTimeStr := MC.ObjToString(v["bid_open_time"])
+				updateStatusTimeStr := MC.ObjToString(v["update_date"])
+				var bidTime, bidEndTime, bidOpenTime, updateStatusTime int64
+				if bidTimeStr != "" {
+					bidTime_, _ := time.ParseInLocation(date.Date_Full_Layout, bidTimeStr, time.Local)
+					bidTime = bidTime_.Unix()
+				}
+
+				if bidEndTimeStr != "" {
+					bidEndTime_, _ := time.ParseInLocation(date.Date_Full_Layout, bidEndTimeStr, time.Local)
+					bidEndTime = bidEndTime_.Unix()
+				}
+
+				if bidOpenTimeStr != "" {
+					bidOpenTime_, _ := time.ParseInLocation(date.Date_Full_Layout, bidOpenTimeStr, time.Local)
+					bidOpenTime = bidOpenTime_.Unix()
+				}
+				if updateStatusTimeStr != "" {
+					updateStatusTime_, _ := time.ParseInLocation(date.Date_Full_Layout, updateStatusTimeStr, time.Local)
+					updateStatusTime = updateStatusTime_.Unix()
+				}
 				data.List = append(data.List, &bxcore.ParticipateList{
 					Id:               encrypt.EncodeArticleId2ByCheck(MC.ObjToString(v["id"])),
 					ProjectName:      MC.ObjToString(v["name"]),
 					Buyer:            MC.ObjToString(v["buyer"]),
 					Budget:           MC.ObjToString(v["budget"]),
-					BidTime:          MC.ObjToString(v["bid_time"]),
-					BidEndTime:       MC.ObjToString(v["bid_end_time"]),
-					BidOpenTime:      MC.ObjToString(v["bid_open_time"]),
-					UpdateStatusTime: MC.ObjToString(v["update_date"]),
+					BidTime:          bidTime,
+					BidEndTime:       bidEndTime,
+					BidOpenTime:      bidOpenTime,
+					UpdateStatusTime: updateStatusTime,
 					UpdateStatusCon:  GetParticipateContent("s", in.PositionId, MC.ObjToString(v["id"])), //查询最后一次 投标状态更新,
 				})
 			}
@@ -640,15 +663,39 @@ func AdminParticipateList(in *bxcore.ParticipateListReq, conditionSql string) (d
 		list := IC.BaseMysql.SelectBySql(adminListSql, in.EntId)
 		if list != nil && len(*list) > 0 {
 			for _, v := range *list {
+				bidTimeStr := MC.ObjToString(v["bid_time"])
+				bidEndTimeStr := MC.ObjToString(v["bid_end_time"])
+				bidOpenTimeStr := MC.ObjToString(v["bid_open_time"])
+				updateStatusTimeStr := MC.ObjToString(v["update_date"])
+				var bidTime, bidEndTime, bidOpenTime, updateStatusTime int64
+				if bidTimeStr != "" {
+					bidTime_, _ := time.ParseInLocation(date.Date_Full_Layout, bidTimeStr, time.Local)
+					bidTime = bidTime_.Unix()
+				}
+
+				if bidEndTimeStr != "" {
+					bidEndTime_, _ := time.ParseInLocation(date.Date_Full_Layout, bidEndTimeStr, time.Local)
+					bidEndTime = bidEndTime_.Unix()
+				}
+
+				if bidOpenTimeStr != "" {
+					bidOpenTime_, _ := time.ParseInLocation(date.Date_Full_Layout, bidOpenTimeStr, time.Local)
+					bidOpenTime = bidOpenTime_.Unix()
+				}
+				if updateStatusTimeStr != "" {
+					updateStatusTime_, _ := time.ParseInLocation(date.Date_Full_Layout, updateStatusTimeStr, time.Local)
+					updateStatusTime = updateStatusTime_.Unix()
+				}
+
 				data.List = append(data.List, &bxcore.ParticipateList{
 					Id:               encrypt.EncodeArticleId2ByCheck(MC.ObjToString(v["id"])),
 					ProjectName:      MC.ObjToString(v["name"]),
 					Buyer:            MC.ObjToString(v["buyer"]),
 					Budget:           MC.ObjToString(v["budget"]),
-					BidTime:          MC.ObjToString(v["bid_time"]),
-					BidEndTime:       MC.ObjToString(v["bid_end_time"]),
-					BidOpenTime:      MC.ObjToString(v["bid_open_time"]),
-					UpdateStatusTime: MC.ObjToString(v["update_date"]),
+					BidTime:          bidTime,
+					BidEndTime:       bidEndTime,
+					BidOpenTime:      bidOpenTime,
+					UpdateStatusTime: updateStatusTime,
 					UpdateStatusCon:  GetParticipateContent("e", in.EntId, MC.ObjToString(v["id"])), //查询最后一次 投标状态更新
 					Participants:     GetParticipateUserName(MC.ObjToString(v["ent_user_id"])),      //参标人信息
 				})

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

@@ -3645,16 +3645,16 @@ type ParticipateList struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Id               string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`                             //项目id
-	ProjectName      string `protobuf:"bytes,2,opt,name=projectName,proto3" json:"projectName,omitempty"`           //项目名称
-	Buyer            string `protobuf:"bytes,3,opt,name=buyer,proto3" json:"buyer,omitempty"`                       //采购单位
-	Budget           string `protobuf:"bytes,4,opt,name=budget,proto3" json:"budget,omitempty"`                     //预算
-	Participants     string `protobuf:"bytes,5,opt,name=participants,proto3" json:"participants,omitempty"`         //参标人 多个,号隔开
-	BidTime          string `protobuf:"bytes,6,opt,name=bidTime,proto3" json:"bidTime,omitempty"`                   //招标日期
-	BidEndTime       string `protobuf:"bytes,7,opt,name=bidEndTime,proto3" json:"bidEndTime,omitempty"`             //投标截止日期
-	BidOpenTime      string `protobuf:"bytes,8,opt,name=bidOpenTime,proto3" json:"bidOpenTime,omitempty"`           //投标截止日期
-	UpdateStatusTime string `protobuf:"bytes,9,opt,name=updateStatusTime,proto3" json:"updateStatusTime,omitempty"` //更新状态时间
-	UpdateStatusCon  string `protobuf:"bytes,10,opt,name=updateStatusCon,proto3" json:"updateStatusCon,omitempty"`  //投标状态更新
+	Id               string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`                              //项目id
+	ProjectName      string `protobuf:"bytes,2,opt,name=projectName,proto3" json:"projectName,omitempty"`            //项目名称
+	Buyer            string `protobuf:"bytes,3,opt,name=buyer,proto3" json:"buyer,omitempty"`                        //采购单位
+	Budget           string `protobuf:"bytes,4,opt,name=budget,proto3" json:"budget,omitempty"`                      //预算
+	Participants     string `protobuf:"bytes,5,opt,name=participants,proto3" json:"participants,omitempty"`          //参标人 多个,号隔开
+	BidTime          int64  `protobuf:"varint,6,opt,name=bidTime,proto3" json:"bidTime,omitempty"`                   //招标日期
+	BidEndTime       int64  `protobuf:"varint,7,opt,name=bidEndTime,proto3" json:"bidEndTime,omitempty"`             //投标截止日期
+	BidOpenTime      int64  `protobuf:"varint,8,opt,name=bidOpenTime,proto3" json:"bidOpenTime,omitempty"`           //投标截止日期
+	UpdateStatusTime int64  `protobuf:"varint,9,opt,name=updateStatusTime,proto3" json:"updateStatusTime,omitempty"` //更新状态时间
+	UpdateStatusCon  string `protobuf:"bytes,10,opt,name=updateStatusCon,proto3" json:"updateStatusCon,omitempty"`   //投标状态更新
 }
 
 func (x *ParticipateList) Reset() {
@@ -3724,32 +3724,32 @@ func (x *ParticipateList) GetParticipants() string {
 	return ""
 }
 
-func (x *ParticipateList) GetBidTime() string {
+func (x *ParticipateList) GetBidTime() int64 {
 	if x != nil {
 		return x.BidTime
 	}
-	return ""
+	return 0
 }
 
-func (x *ParticipateList) GetBidEndTime() string {
+func (x *ParticipateList) GetBidEndTime() int64 {
 	if x != nil {
 		return x.BidEndTime
 	}
-	return ""
+	return 0
 }
 
-func (x *ParticipateList) GetBidOpenTime() string {
+func (x *ParticipateList) GetBidOpenTime() int64 {
 	if x != nil {
 		return x.BidOpenTime
 	}
-	return ""
+	return 0
 }
 
-func (x *ParticipateList) GetUpdateStatusTime() string {
+func (x *ParticipateList) GetUpdateStatusTime() int64 {
 	if x != nil {
 		return x.UpdateStatusTime
 	}
-	return ""
+	return 0
 }
 
 func (x *ParticipateList) GetUpdateStatusCon() string {
@@ -4469,13 +4469,13 @@ var file_bxcore_proto_rawDesc = []byte{
 	0x0a, 0x0c, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e, 0x74, 0x73, 0x18, 0x05,
 	0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x70, 0x61, 0x72, 0x74, 0x69, 0x63, 0x69, 0x70, 0x61, 0x6e,
 	0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x62, 0x69, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x07, 0x62, 0x69, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
-	0x62, 0x69, 0x64, 0x45, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09,
+	0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x69, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a,
+	0x62, 0x69, 0x64, 0x45, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03,
 	0x52, 0x0a, 0x62, 0x69, 0x64, 0x45, 0x6e, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b,
 	0x62, 0x69, 0x64, 0x4f, 0x70, 0x65, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0b, 0x62, 0x69, 0x64, 0x4f, 0x70, 0x65, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2a,
+	0x03, 0x52, 0x0b, 0x62, 0x69, 0x64, 0x4f, 0x70, 0x65, 0x6e, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x2a,
 	0x0a, 0x10, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x54, 0x69,
-	0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,
+	0x6d, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x10, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65,
 	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x75, 0x70,
 	0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x43, 0x6f, 0x6e, 0x18, 0x0a, 0x20,
 	0x01, 0x28, 0x09, 0x52, 0x0f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x53, 0x74, 0x61, 0x74, 0x75,