提交

src/jfw/front/dataExport.go

@@ -510,7 +510,7 @@ func (d *DataExport) PreviewData(source, _id string) error {
 	//从500条数据中筛选字段最全五条
 	scd := dataexport.GetSqlObjFromId(public.MQFW, _id)
 	kws := scd.Keyword
-	res, err := dataexport.GetDataExportSearchResult(public.Mgo_Ent, public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1, util.ObjToString(config.Seoconfig["webdomain"]))
+	res, err := dataexport.GetDataExportSearchResult(public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
 	if res == nil || err != nil {
 		log.Println("PreviewData查询出错", res)
 		return d.Render("/pc/dataExport_noDataErr.html", &d.T)

src/jfw/front/ws_dataExport.go

@@ -202,7 +202,7 @@ func (w *WsDataExport) GetPreview() error {
 	//从500条数据中筛选字段最全五条
 	scd := dataexport.GetSqlObjFromId(public.MQFW, _id)
 	kws := scd.Keyword
-	res, err := dataexport.GetDataExportSearchResult(public.Mgo_Ent, public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1, util.ObjToString(config.Seoconfig["webdomain"]))
+	res, err := dataexport.GetDataExportSearchResult(public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
 	if res == nil || err != nil {
 		log.Println("PreviewData查询出错")
 		return w.Render("/pc/dataExport_noDataErr.html", &w.T)
@@ -374,9 +374,9 @@ func (wd *WsDataExport) SearchExport() error {
 	}
 	//接收超级搜索页面参数
 	reqData := public.BidSearchExport{
-		Keywords:     wd.GetString("keywords"),                    //搜索词
+		Keywords:     wd.GetString("searchvalue"),                 //搜索词
 		Publishtime:  wd.GetString("publishtime"),                 //发布时间
-		Area:         wd.GetString("area"),                        //地区
+		Area:         wd.GetString("scope"),                       //地区
 		Subtype:      wd.GetString("subtype"),                     //信息类型
 		Minprice:     wd.GetString("minprice"),                    //最低价格
 		Maxprice:     wd.GetString("maxprice"),                    //最高价格

src/jfw/modules/app/src/app/front/ws_dataExport.go

@@ -65,7 +65,7 @@ func (w *WsDataExport) GetPreview() error {
 	//从500条数据中筛选字段最全五条
 	scd := dataexport.GetSqlObjFromId(public.MQFW, _id)
 	kws := scd.Keyword
-	res, err := dataexport.GetDataExportSearchResult(public.Mgo_Ent, public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1, util.ObjToString(config.Seoconfig["webdomain"]))
+	res, err := dataexport.GetDataExportSearchResult(public.DbConf.Elasticsearch.Main.Address, scd, dataType, -1)
 	if res == nil || err != nil {
 		log.Println("PreviewData查询出错")
 		return w.Render("/pc/dataExport_noDataErr.html", &w.T)
@@ -340,9 +340,9 @@ func (wd *WsDataExport) SearchExport() error {
 	}
 	//接收超级搜索页面参数
 	reqData := public.BidSearchExport{
-		Keywords:     wd.GetString("keywords"),                    //搜索词
+		Keywords:     wd.GetString("searchvalue"),                 //搜索词
 		Publishtime:  wd.GetString("publishtime"),                 //发布时间
-		Area:         wd.GetString("area"),                        //地区
+		Area:         wd.GetString("scope"),                       //地区
 		Subtype:      wd.GetString("subtype"),                     //信息类型
 		Minprice:     wd.GetString("minprice"),                    //最低价格
 		Maxprice:     wd.GetString("maxprice"),                    //最高价格

src/jfw/modules/common/src/qfw/util/dataexport/dataexport.go

@@ -356,17 +356,16 @@ func isNullSearch(scd *SieveCondition) (isNull bool) {
  * webdomain 三级页域名
  * count 返回数量 (-1:预览数据查询)
  */
-var EntTable = "winner_enterprise"
 
-func GetDataExportSearchResultByScdId(sim, entmg mg.MongodbSim, elasticAddress, id string, dataType string, checkCount int, webdomain string) (*[]map[string]interface{}, error) {
+func GetDataExportSearchResultByScdId(sim mg.MongodbSim, elasticAddress, id, dataType string, checkCount int) (*[]map[string]interface{}, error) {
 	scd := GetSqlObjFromId(sim, id)
-	return GetDataExportSearchResult(entmg, elasticAddress, scd, dataType, checkCount, webdomain)
+	return GetDataExportSearchResult(elasticAddress, scd, dataType, checkCount)
 }
 
 //GetDataExportSearchResult 获取数据导出内容
 //entmg 高级字段包查询企业电话邮箱等字段
 //checkCount -1 预览500条
-func GetDataExportSearchResult(entmg mg.MongodbSim, elasticAddress string, scd *SieveCondition, dataType string, checkCount int, webdomain string) (*[]map[string]interface{}, error) {
+func GetDataExportSearchResult(elasticAddress string, scd *SieveCondition, dataType string, checkCount int) (*[]map[string]interface{}, error) {
 	defer qutil.Catch()
 	var res []map[string]interface{}
 	//获取查询语句
@@ -456,7 +455,6 @@ func GetDataExportSearchResult(entmg mg.MongodbSim, elasticAddress string, scd *
 		return nil, fmt.Errorf("GetDataExportSearchResult-%s-数据总量校验异常，期望:%d,实际:%d", scd.Id, checkCount, len(res))
 		//发邮件
 	}
-	res = *FormatExportData(entmg, &res, webdomain, dataType)
 	return &res, nil
 }
 
@@ -525,7 +523,7 @@ func FormatExportData(entmg mg.MongodbSim, data *[]map[string]interface{}, webdo
 			//查询企业公示 法人 公司电话 公司邮箱地址
 			s_winner, ok := v["s_winner"].(string) //改为entidlist？
 			if ok && s_winner != "" {
-				if entData, ok := entmg.Find(EntTable, bson.M{"company_name": s_winner}, nil, `{"company_name":1,"company_email":1,"legal_person":1,"company_phone":1}`, false, -1, -1); ok {
+				if entData, ok := entmg.Find("winner_enterprise", bson.M{"company_name": s_winner}, nil, `{"company_name":1,"company_email":1,"legal_person":1,"company_phone":1}`, false, -1, -1); ok {
 					if entData != nil && *entData != nil && len(*entData) > 0 {
 						for _, ev := range *entData {
 							if v["s_winner"] == ev["company_name"] {
@@ -683,6 +681,7 @@ func doSearch(sql string, start, count int, dataType string) *[]map[string]inter
 		//分页排序
 		sql = sql[:len(sql)-1] + `,"sort": {"publishtime":"desc"},"from":` + strconv.Itoa(start) + `,"size":` + strconv.Itoa(count) + "}"
 	}
+	log.Println("doSearch", sql)
 	return elastic.Get(INDEX, TYPE, sql)
 }
 
@@ -751,7 +750,6 @@ func ScreenData(arr *[]map[string]interface{}, dataType string, resultNum int, k
 		keys = append(keys, k)
 	}
 	sort.Ints(keys)
-	log.Println("空字段数量", keys)
 	//选取结果
 	for _, v := range keys {
 		if len(AllMap[v]) >= resultNum {

src/jfw/modules/subscribepay/src/service/dataExportPay.go

@@ -151,7 +151,8 @@ func (p *DataExportPay) CreateOrder() {
 		ordercode := pay.GetOrderCode(openId)
 		download_url := util.GetExcelFilePath(ordercode)
 		go func() {
-			list, err := dataexport.GetDataExportSearchResultByScdId(util.MQFW, util.MQFWENT, config.Config.Elasticsearch, id, qutil.If(data_spec == "高级字段包", "2", "1").(string), data_count, config.Config.WebDomain)
+			list, err := dataexport.GetDataExportSearchResultByScdId(util.MQFW, config.Config.Elasticsearch, id, qutil.If(data_spec == "高级字段包", "2", "1").(string), data_count)
+			list = dataexport.FormatExportData(util.MQFWENT, list, config.Config.WebDomain, qutil.If(data_spec == "高级字段包", "2", "1").(string))
 			if err == nil {
 				err = util.CreateDataExportExcelFile(list, data_spec == "高级字段包", download_url)
 			}

src/jfw/public/entdataexport.go

@@ -30,7 +30,7 @@ func GetEntDataExportCount(_id string, entId, entUserId, limitNum, current int,
 	dataType := "2"
 	//数据导出数据查询
 
-	res, err := dataexport.GetDataExportSearchResultByScdId(Mgo_Ent, MQFW, DbConf.Elasticsearch.Main.Address, _id, dataType, count, webdomain)
+	res, err := dataexport.GetDataExportSearchResultByScdId(MQFW, DbConf.Elasticsearch.Main.Address, _id, dataType, count)
 	if err != nil {
 		log.Println("企业数据导出错误 ", err)
 		return 0, 0, nil