fix:数据导出页预览接口

src/jfw/front/dataExport.go

@@ -87,7 +87,8 @@ func (d *DataExport) ToSieve() error {
 	return nil
 }
 
-func (d *DataExport) SieveData() error {
+func (d *DataExport) SieveData() {
+	dataType := d.GetString("dataType")
 	publishtime := d.GetString("publishtime")
 	area := d.GetString("area")
 	city := d.GetString("city")
@@ -182,14 +183,45 @@ func (d *DataExport) SieveData() error {
 		sieveCondition["s_userid"] = d.GetSession("userId").(string)
 	}
 	_id := mongodb.Save(dataexport.ExportTable, sieveCondition)
+	_res := map[string]interface{}{
+		"error_code": 0,
+		"error_msg":  "",
+	}
 	if _id != "" {
-		d.T["success"] = true
-		d.T["redirectUrl"] = "/front/dataExport/toCreateOrderPage/" + util.SE.Encode2Hex(_id)
+		//从500条数据中筛选字段最全五条
+		scd := dataexport.GetSqlObjFromId(public.MQFW, _id)
+		kws := scd.Keyword
+		res, err := dataexport.GetDataExportSearchResult(public.Mgo_Bidding, public.DbConf.Mongodb.Bidding.DbName, public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
+		if res == nil || err != nil {
+			_res["error_msg"] = "无数据"
+			d.ServeJson(_res)
+			return
+		}
+		//格式化字段
+		res_screen := dataexport.ScreenData(res, dataType, 20, kws)
+		var EntArr = []string{}
+		if dataType == "2" {
+			for _, v := range res_screen {
+				//高级字段查询且winner不为空
+				if v["s_winner"] != nil && v["s_winner"] != "" {
+					EntArr = append(EntArr, v["s_winner"].(string))
+				}
+			}
+		}
+		list := dataexport.FormatExportData(public.Mgo_Ent, &res_screen, config.Sysconfig["webdomain"].(string), dataType, true)
+		_res["data"] = map[string]interface{}{
+			"list": subUrl(list, dataType),
+			"_id":  util.SE.Encode2Hex(_id),
+		}
+		d.ServeJson(_res)
+		//_res["dataType"] = dataType
+		//d.T["success"] = true
+		//d.T["redirectUrl"] = "/front/dataExport/toCreateOrderPage/" + util.SE.Encode2Hex(_id)
 	} else {
-		d.T["success"] = false
+		_res["error_code"] = -1
+		_res["error_msg"] = "保存筛选条件失败"
+		d.ServeJson(_res)
 	}
-	d.ServeJson(&d.T)
-	return nil
 }
 
 /**