|
|
@@ -86,6 +86,11 @@ var onceSearchCount = 500
|
|
|
var ExportTable string = "export_search"
|
|
|
var searchPool = make(chan bool, 8)
|
|
|
|
|
|
+const (
|
|
|
+ bidBaseField = `"_id", "title", "detail", "area", "city", "publishtime", "projectname", "buyer", "s_winner", "bidamount", "subtype", "toptype", "filetext", "purchasing"`
|
|
|
+ bidseniorField = bidBaseField + `,"href", "projectcode", "buyerperson", "buyertel", "budget", "bidopentime", "agency", "projectscope", "winnerperson", "winnertel", "bidendtime", "district", "signendtime", "buyeraddr","buyerclass","s_topscopeclass","entidlist","signaturedate"`
|
|
|
+)
|
|
|
+
|
|
|
var topType = map[string]string{
|
|
|
"招标预告": "预告",
|
|
|
"招标公告": "招标",
|
|
|
@@ -682,15 +687,9 @@ func GetDataExportSelectReallyCountFromMongo(bid mg.MongodbSim, biddingName stri
|
|
|
}
|
|
|
|
|
|
func GetDataExportSelectResultFromEs(bidding mg.MongodbSim, biddingName string, scd *SieveCondition, dataType string, checkCount int) (*[]map[string]interface{}, error) {
|
|
|
- bidField := `"_id", "title", "detail", "area", "city", "publishtime", "projectname", "buyer", "s_winner", "bidamount", "subtype", "toptype", "filetext", "purchasing"`
|
|
|
- //selectMap := map[string]interface{}{
|
|
|
- // "_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,
|
|
|
- //}
|
|
|
+ bidField := bidBaseField
|
|
|
if dataType == "2" {
|
|
|
- bidField = bidField + `,"href", "projectcode", "buyerperson", "buyertel", "budget", "bidopentime", "agency", "projectscope", "winnerperson", "winnertel", "bidendtime", "district", "signendtime", "buyeraddr","buyerclass","s_topscopeclass","entidlist","signaturedate"`
|
|
|
- //for _, key := range []string{"href", "projectcode", "buyerperson", "buyertel", "budget", "bidopentime", "agency", "projectscope", "winnerperson", "winnertel", "bidendtime", "district", "signendtime", "buyeraddr", "filetext"} {
|
|
|
- // selectMap[key] = 1
|
|
|
- //}
|
|
|
+ bidField = bidseniorField
|
|
|
}
|
|
|
if checkCount == -1 && len(scd.SelectIds) > 500 {
|
|
|
scd.SelectIds = scd.SelectIds[:500]
|
|
|
@@ -1210,9 +1209,9 @@ func doSearch(sql string, start, count int, dataType string) *[]map[string]inter
|
|
|
if sql != "" {
|
|
|
//筛选字段
|
|
|
if dataType != "" {
|
|
|
- dataexport_field := `"_id","title","detail","area","city","publishtime","projectname","buyer","s_winner","bidamount","subtype","toptype","filetext","purchasing"`
|
|
|
+ dataexport_field := bidBaseField
|
|
|
if dataType == "2" {
|
|
|
- dataexport_field += `,"href","projectcode","buyerperson","buyertel","budget","bidopentime","agency","projectscope","winnerperson","winnertel","bidendtime","district","signendtime","buyeraddr","buyerclass","s_topscopeclass","entidlist"`
|
|
|
+ dataexport_field = bidseniorField
|
|
|
}
|
|
|
sql = sql[:len(sql)-1] + `,"_source":[` + dataexport_field + "]}"
|
|
|
}
|
