|
|
@@ -687,7 +687,7 @@ func GetDataExportSelectResultFromEs(bidding mg.MongodbSim, biddingName string,
|
|
|
// "_id": 1, "title": 1, "detail": 1, "area": 1, "city": 1, "publishtime": 1, "projectname": 1, "buyer": 1, "s_winner": 1, "bidamount": 1, "subtype": 1, "toptype": 1, "filetext": 1, "purchasing": 1,
|
|
|
//}
|
|
|
if dataType == "2" {
|
|
|
- bidField = bidField + `,"href", "projectcode", "buyerperson", "buyertel", "budget", "bidopentime", "agency", "projectscope", "winnerperson", "winnertel", "bidendtime", "district", "signendtime", "buyeraddr","buyerclass","s_topscopeclass","entidlist"`
|
|
|
+ bidField = bidField + `,"href", "projectcode", "buyerperson", "buyertel", "budget", "bidopentime", "agency", "projectscope", "winnerperson", "winnertel", "bidendtime", "district", "signendtime", "buyeraddr","buyerclass","s_topscopeclass","entidlist","yuceendtime"`
|
|
|
//for _, key := range []string{"href", "projectcode", "buyerperson", "buyertel", "budget", "bidopentime", "agency", "projectscope", "winnerperson", "winnertel", "bidendtime", "district", "signendtime", "buyeraddr", "filetext"} {
|
|
|
// selectMap[key] = 1
|
|
|
//}
|
|
|
@@ -740,7 +740,7 @@ func GetDataExportSelectResultFromMongoDb(bidding mg.MongodbSim, biddingName str
|
|
|
"_id": 1, "title": 1, "detail": 1, "area": 1, "city": 1, "publishtime": 1, "projectname": 1, "buyer": 1, "s_winner": 1, "bidamount": 1, "subtype": 1, "toptype": 1, "filetext": 1, "purchasing": 1,
|
|
|
}
|
|
|
if dataType == "2" {
|
|
|
- for _, key := range []string{"href", "projectcode", "buyerperson", "buyertel", "budget", "bidopentime", "agency", "projectscope", "winnerperson", "winnertel", "bidendtime", "district", "signendtime", "buyeraddr", "filetext", "buyerclass", "s_topscopeclass", "entidlist"} {
|
|
|
+ for _, key := range []string{"href", "projectcode", "buyerperson", "buyertel", "budget", "bidopentime", "agency", "projectscope", "winnerperson", "winnertel", "bidendtime", "district", "signendtime", "buyeraddr", "filetext", "buyerclass", "s_topscopeclass", "entidlist", "yuceendtime"} {
|
|
|
selectMap[key] = 1
|
|
|
}
|
|
|
}
|
|
|
@@ -1146,6 +1146,10 @@ func FormatExportData(entmg mg.MongodbSim, data *[]map[string]interface{}, webdo
|
|
|
date := v["bidendtime"]
|
|
|
v["bidendtime"] = FormatDateWithObj(&date, Date_Short_Layout)
|
|
|
}
|
|
|
+ if v["yuceendtime"] != nil {
|
|
|
+ date := v["yuceendtime"]
|
|
|
+ v["yuceendtime"] = FormatDateWithObj(&date, Date_Short_Layout)
|
|
|
+ }
|
|
|
if v["_id"] != nil {
|
|
|
encodeId := CommonEncodeArticle("content", v["_id"].(string))
|
|
|
v["url"] = webdomain + "/article/content/" + encodeId + ".html"
|
