标讯搜索数据导出调整

src/jfw/front/dataExport.go

@@ -366,6 +366,8 @@ func (d *DataExport) SuperSearchExport() error {
 	d.SetSession("Echo_hasWinnertel", reqData.Haswinnertel)
 
 	saveData := reqData.PassBidSearchExport()
+	saveData["selectType"] = strings.Join(jy.GetVipState(public.Mysql, public.MQFW, userId).
+		GetQueryItems(d.GetString("selectType"), util.Int64All(config.Sysconfig["bidSearchOldUserLimit"])), ",")
 	saveData["s_openid"] = openid
 	saveData["s_userid"] = userId
 	saveData["comeinfrom"] = "supersearchPage"

src/jfw/front/ws_dataExport.go

@@ -7,6 +7,7 @@ import (
 	"jfw/config"
 	"jfw/jyutil"
 	"qfw/util/dataexport"
+	"qfw/util/jy"
 	"strconv"
 
 	"github.com/go-xweb/xweb"
@@ -389,6 +390,8 @@ func (wd *WsDataExport) SearchExport() error {
 	}
 
 	saveData := reqData.PassBidSearchExport()
+	saveData["selectType"] = strings.Join(jy.GetVipState(public.Mysql, public.MQFW, userId).
+		GetQueryItems(wd.GetString("selectType"), util.Int64All(config.Sysconfig["bidSearchOldUserLimit"])), ",")
 	saveData["s_openid"] = openid
 	saveData["s_userid"] = userId
 	saveData["comeinfrom"] = "supersearchPage"

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

@@ -9,6 +9,7 @@ import (
 	"log"
 	"qfw/util"
 	"qfw/util/dataexport"
+	"qfw/util/jy"
 	"qfw/util/redis"
 	"regexp"
 	"strconv"
@@ -356,6 +357,8 @@ func (wd *WsDataExport) SearchExport() error {
 	}
 
 	saveData := reqData.PassBidSearchExport()
+	saveData["selectType"] = strings.Join(jy.GetVipState(public.Mysql, public.MQFW, userId).
+		GetQueryItems(wd.GetString("selectType"), util.Int64All(config.Sysconfig["bidSearchOldUserLimit"])), ",")
 	saveData["s_openid"] = openid
 	saveData["s_userid"] = userId
 	saveData["comeinfrom"] = "supersearchPage"

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

@@ -207,10 +207,15 @@ func getDataExportSql(scd *SieveCondition) string {
 	//should
 	if len(scd.Keyword) > 0 {
 		boolsNum = 1
-		if scd.SelectType == "" || scd.SelectType == "all" {
-			scd.SelectType = "detail\", \"title"
+		queryItem := ""
+		if scd.SelectType == "" {
+			queryItem = "title"
+		} else if scd.SelectType == "all" {
+			queryItem = "detail\", \"title"
+		} else {
+			queryItem = strings.ReplaceAll(scd.SelectType, ",", "\",\"")
 		}
-		multi_match = fmt.Sprintf(multi_match, "%s", "\""+scd.SelectType+"\"")
+		multi_match = fmt.Sprintf(multi_match, "%s", "\""+queryItem+"\"")
 
 		if scd.Comeinfrom == "supersearchPage" {
 			var keywordArr []string

src/jfw/modules/subscribepay/src/entity/dataexport.go

@@ -592,13 +592,28 @@ func GetDataExportMailContent(orderCode string) (content string, err error) {
 	if err != nil {
 		return "", err
 	}
-	selectType := "title"
+	keywordsMatchItemShow := "标题"
 	if sc != nil {
-		selectType = qutil.ObjToString(sc.SelectType)
-		if selectType == "title" {
-			selectType = "标题匹配"
-		} else {
-			selectType = "全文匹配"
+		var keywordsMatchItemShowArr []string
+		for _, item := range strings.Split(sc.SelectType, ",") {
+			if item == "all" {
+				keywordsMatchItemShowArr = append(keywordsMatchItemShowArr, "全部")
+			} else if item == "title" {
+				keywordsMatchItemShowArr = append(keywordsMatchItemShowArr, "标题")
+			} else if item == "detail" {
+				keywordsMatchItemShowArr = append(keywordsMatchItemShowArr, "正文")
+			} else if item == "mbuyer" {
+				keywordsMatchItemShowArr = append(keywordsMatchItemShowArr, "采购单位")
+			} else if item == "mwinner" {
+				keywordsMatchItemShowArr = append(keywordsMatchItemShowArr, "中标企业")
+			} else if item == "magency" {
+				keywordsMatchItemShowArr = append(keywordsMatchItemShowArr, "招标代理机构")
+			} else if item == "filetext" {
+				keywordsMatchItemShowArr = append(keywordsMatchItemShowArr, "附件")
+			}
+		}
+		if keywordsMatchItemShowArr != nil {
+			keywordsMatchItemShow = strings.Join(keywordsMatchItemShowArr, " ")
 		}
 		//
 		if pay_time != "" {
@@ -648,7 +663,7 @@ func GetDataExportMailContent(orderCode string) (content string, err error) {
 	} else {
 		log.Println("用户筛选条件错误", err, sc)
 	}
-	content = fmt.Sprintf(config.ExConf.Mail_attach_content, download_url, orderCode, create_time, pay_time, product_type, data_spec, data_count, order_money, user_mail, user_phone, publishtime, region, industry, buyerclass, keys, selectType, sc_money, subtype, buyer, winner)
+	content = fmt.Sprintf(config.ExConf.Mail_attach_content, download_url, orderCode, create_time, pay_time, product_type, data_spec, data_count, order_money, user_mail, user_phone, publishtime, region, industry, buyerclass, keys, keywordsMatchItemShow, sc_money, subtype, buyer, winner)
 	return content, nil
 }