|
@@ -40,14 +40,12 @@ func taskB() {
|
|
|
wg.Done()
|
|
|
}()
|
|
|
if util.IntAll(tmp["extracttype"]) != -1 {
|
|
|
- //taskBase(tmp) //基础标讯数据
|
|
|
- //taskExpand(tmp) //扩展数据
|
|
|
- //taskDetail(tmp) //正文信息
|
|
|
- //taskAtts(tmp) //附件信息
|
|
|
+ //taskBase(tmp) //基础标讯数据
|
|
|
+ //taskExpand(tmp) //扩展数据
|
|
|
+ //taskDetail(tmp) //正文信息
|
|
|
+ //taskAtts(tmp) //附件信息
|
|
|
//taskIntent(tmp) //采购意向
|
|
|
- taskPackage(tmp) //分包
|
|
|
-
|
|
|
- //taskWinner(tmp)
|
|
|
+ //taskPackage(tmp) //分包
|
|
|
}
|
|
|
}(tmp)
|
|
|
tmp = make(map[string]interface{})
|
|
@@ -280,11 +278,13 @@ func taskAttsAttach(att_info map[string]interface{}, tmpid string, f_id int64) {
|
|
|
info["s_file_id"] = f_id
|
|
|
info["d_createtime"] = time.Now().Format(util.Date_Full_Layout)
|
|
|
attach_url := util.ObjToString(att["attach_url"])
|
|
|
- bs := OssGetObject(attach_url)
|
|
|
- //if utf8.RuneCountInString(bs) > 100000 {
|
|
|
- // bs = string(([]rune(bs))[:100000])
|
|
|
- //}
|
|
|
- info["s_file_text"] = bs
|
|
|
+ if attach_url != "" {
|
|
|
+ //bs := OssGetObject(attach_url)
|
|
|
+ //if utf8.RuneCountInString(bs) > 100000 {
|
|
|
+ // bs = string(([]rune(bs))[:100000])
|
|
|
+ //}
|
|
|
+ //info["s_file_text"] = bs
|
|
|
+ }
|
|
|
saveAttrPool <- info
|
|
|
}
|
|
|
}
|
|
@@ -292,43 +292,44 @@ func taskAttsAttach(att_info map[string]interface{}, tmpid string, f_id int64) {
|
|
|
|
|
|
// @Description 采购意向
|
|
|
func taskIntent(tmp map[string]interface{}) {
|
|
|
- if arr, ok := tmp["procurementlist"].([]interface{}); ok {
|
|
|
- for _, p := range arr {
|
|
|
- p1 := p.(map[string]interface{})
|
|
|
- saveM := map[string]interface{}{}
|
|
|
- saveM["s_info_id"] = mongodb.BsonIdToSId(tmp["_id"])
|
|
|
- if p1["itemname"] != nil {
|
|
|
- saveM["s_intention_name"] = p1["itemname"]
|
|
|
- }
|
|
|
- if p1["projectscope"] != nil {
|
|
|
- saveM["s_intention_demand"] = p1["projectscope"]
|
|
|
- }
|
|
|
- if p1["item"] != nil {
|
|
|
- saveM["s_item"] = p1["item"]
|
|
|
- }
|
|
|
- if p1["totalprice"] != nil {
|
|
|
- saveM["f_totalprice"] = p1["totalprice"]
|
|
|
- }
|
|
|
- if p1["expurasingtime"] != nil {
|
|
|
- saveM["s_expurasingtime"] = p1["expurasingtime"]
|
|
|
- }
|
|
|
- if p1["reserved_amount"] != nil {
|
|
|
- saveM["s_reserved_amount"] = p1["reserved_amount"]
|
|
|
- }
|
|
|
- if b := util.ObjToString(tmp["buyer"]); b != "" {
|
|
|
- if code := getNameId(b); code != "" {
|
|
|
- saveM["s_buyer_id"] = code
|
|
|
- }
|
|
|
+ procurementlist := IsMarkInterfaceMap(tmp["procurementlist"])
|
|
|
+ tmpid := mongodb.BsonIdToSId(tmp["_id"])
|
|
|
+ for _, p1 := range procurementlist {
|
|
|
+ info := map[string]interface{}{}
|
|
|
+ info["s_info_id"] = tmpid
|
|
|
+ if p1["itemname"] != nil {
|
|
|
+ info["s_intention_name"] = p1["itemname"]
|
|
|
+ }
|
|
|
+ if p1["projectscope"] != nil {
|
|
|
+ info["s_intention_demand"] = p1["projectscope"]
|
|
|
+ }
|
|
|
+ if p1["item"] != nil {
|
|
|
+ info["s_item"] = p1["item"]
|
|
|
+ }
|
|
|
+ if p1["totalprice"] != nil {
|
|
|
+ info["f_totalprice"] = p1["totalprice"]
|
|
|
+ }
|
|
|
+ if p1["expurasingtime"] != nil {
|
|
|
+ info["s_expurasingtime"] = p1["expurasingtime"]
|
|
|
+ }
|
|
|
+ if p1["reserved_amount"] != nil {
|
|
|
+ info["s_reserved_amount"] = p1["reserved_amount"]
|
|
|
+ }
|
|
|
+ if b := util.ObjToString(tmp["buyer"]); b != "" {
|
|
|
+ if code := getNameId(b); code != "" {
|
|
|
+ info["s_buyer_id"] = code
|
|
|
}
|
|
|
- saveM["d_createtime"] = time.Now().Format(util.Date_Full_Layout)
|
|
|
- saveIntentPool <- saveM
|
|
|
}
|
|
|
+ info["d_createtime"] = time.Now().Format(util.Date_Full_Layout)
|
|
|
+ //InsertGlobalMysqlData("dwd_f_bid_intention_baseinfo", info, tmpid)
|
|
|
+ saveIntentPool <- info
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// @Description 分包基本信息
|
|
|
func taskPackage(tmp map[string]interface{}) {
|
|
|
tmpid := mongodb.BsonIdToSId(tmp["_id"])
|
|
|
+ //筛选分包
|
|
|
packages := filterPackageInfos(tmp)
|
|
|
if len(packages) <= 1 { //单包···标讯本身
|
|
|
baseInfo := CPBaseInfoFromBidding(tmp, tmpid)
|
|
@@ -337,15 +338,27 @@ func taskPackage(tmp map[string]interface{}) {
|
|
|
//投标人信息
|
|
|
CPBidderBiddingBaseInfo(tmp, tmpid, pid)
|
|
|
//标的物信息
|
|
|
- //new_purlist := CPBiddingPackageGoodsBaseInfo(tmp, tmpid, pid)
|
|
|
- //for _,v := range new_purlist {
|
|
|
- //
|
|
|
- //}
|
|
|
+ new_purlist := CPBiddingPackageGoodsBaseInfo(tmp, tmpid, pid)
|
|
|
+ for _, v := range new_purlist {
|
|
|
+ saveGoodsPool <- v
|
|
|
+ }
|
|
|
}
|
|
|
} else { //多包...具体源信息
|
|
|
- //for k, v := range packages {
|
|
|
- // baseInfo := CPBaseInfoFromPackage(v, tmpid)
|
|
|
- //}
|
|
|
+ for k, v := range packages {
|
|
|
+ baseInfo := CPBaseInfoFromPackage(v, tmpid)
|
|
|
+ pid := InsertGlobalMysqlData("dwd_f_bid_package_baseinfo", baseInfo, tmpid)
|
|
|
+ if pid > 0 { //投标人信息
|
|
|
+ if k == 0 { //标的物信息
|
|
|
+ CPBidderPackageBaseInfo(v, tmp, tmpid, pid, true)
|
|
|
+ new_purlist := CPBiddingPackageGoodsBaseInfo(tmp, tmpid, pid)
|
|
|
+ for _, v1 := range new_purlist {
|
|
|
+ saveGoodsPool <- v1
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ CPBidderPackageBaseInfo(v, tmp, tmpid, pid, false)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|