搜索和导出 数据量同步

src/jfw/front/wx_dataExport.go

@@ -94,6 +94,7 @@ func (w *WxDataExport) SaveData() error {
 	keyWord := w.GetString("keyWord")                      //关键词
 	buyer := w.GetString("buyer")                          //采购单位
 	winner := w.GetString("winner")                        //中标单位
+	selectType := w.GetString("selectType")                //标题 or 全文
 
 	var areaArr []string
 	var cityArr []string
@@ -149,16 +150,16 @@ func (w *WxDataExport) SaveData() error {
 			log.Println("keyWordArr", len(keyWordArr), keyWordArr)
 		}
 	}
-	log.Println("date", publishtime)
-	log.Println("area", areaArr)
-	log.Println("city", cityArr)
-	log.Println("region", regionArr)
-	log.Println("industry", industryArr)
-	log.Println("subType", subType)
-	log.Println("min", min)
-	log.Println("max", max)
-	log.Println("buyer", buyerArr)
-	log.Println("winner", winnerArr)
+	//	log.Println("date", publishtime)
+	//	log.Println("area", areaArr)
+	//	log.Println("city", cityArr)
+	//	log.Println("region", regionArr)
+	//	log.Println("industry", industryArr)
+	//	log.Println("subType", subType)
+	//	log.Println("min", min)
+	//	log.Println("max", max)
+	//	log.Println("buyer", buyerArr)
+	//	log.Println("winner", winnerArr)
 
 	saveData := map[string]interface{}{
 		"publishtime": publishtime,
@@ -174,6 +175,7 @@ func (w *WxDataExport) SaveData() error {
 		"winner":      winnerArr,
 		"comeintime":  time.Now().Unix(),
 		"comeinfrom":  "exportPage",
+		"selectType":  selectType,
 	}
 	if w.GetSession("s_m_openid") != nil {
 		saveData["s_openid"] = w.GetSession("s_m_openid").(string)

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

@@ -88,6 +88,7 @@ func (w *WxDataExport) SaveData() error {
 	keyWord := w.GetString("keyWord")                      //关键词
 	buyer := w.GetString("buyer")                          //采购单位
 	winner := w.GetString("winner")                        //中标单位
+	selectType := w.GetString("selectType")                //标题 or 全文
 
 	var areaArr []string
 	var cityArr []string
@@ -143,16 +144,16 @@ func (w *WxDataExport) SaveData() error {
 			log.Println("keyWordArr", len(keyWordArr), keyWordArr)
 		}
 	}
-	log.Println("date", publishtime)
-	log.Println("area", areaArr)
-	log.Println("city", cityArr)
-	log.Println("region", regionArr)
-	log.Println("industry", industryArr)
-	log.Println("subType", subType)
-	log.Println("min", min)
-	log.Println("max", max)
-	log.Println("buyer", buyerArr)
-	log.Println("winner", winnerArr)
+	//	log.Println("date", publishtime)
+	//	log.Println("area", areaArr)
+	//	log.Println("city", cityArr)
+	//	log.Println("region", regionArr)
+	//	log.Println("industry", industryArr)
+	//	log.Println("subType", subType)
+	//	log.Println("min", min)
+	//	log.Println("max", max)
+	//	log.Println("buyer", buyerArr)
+	//	log.Println("winner", winnerArr)
 
 	saveData := map[string]interface{}{
 		"publishtime": publishtime,
@@ -166,6 +167,7 @@ func (w *WxDataExport) SaveData() error {
 		"subtype":     subType,
 		"buyer":       buyerArr,
 		"winner":      winnerArr,
+		"selectType":  selectType,
 		"comeintime":  time.Now().Unix(),
 		"comeinfrom":  "exportPage",
 	}

src/jfw/modules/app/src/web/templates/dataExport/dataExport.html

@@ -466,7 +466,6 @@
             $("#endtime").mobiscroll('show');
         });
 		var onceDetail = {{.T.orderDetail}}
-		console.log(onceDetail)
 		if(onceDetail!=""){
 			var filter = onceDetail["filter"];
 	        //金额
@@ -521,13 +520,13 @@
 			}
 			//采购单位
 	        if(filter["buyer"]!=null&&filter["buyer"].length>0){
-				localStorage.buyer = JSON.stringify(filter["buyer"])
+				localStorage.buyer = filter["buyer"].join(",");
 	        }else{
 				localStorage.buyer = "";
 			}
 	        //中标单位
 	        if(filter["winner"]!=null&&filter["winner"].length>0){
-				localStorage.winner = JSON.stringify(filter["winner"])
+				localStorage.winner = filter["winner"].join(",");
 	        }else{
 				localStorage.winner = "";
 			}
@@ -563,6 +562,11 @@
 	            localStorage.removeItem("export_starttime");
 	            localStorage.removeItem("export_endtime");
 			}
+	        if(filter["selectType"]!=null&&filter["selectType"]!=""){
+				localStorage.selectType = filter["selectType"];
+	        }else{
+				localStorage.selectType = "";
+			}
 			window.history.replaceState({}, '数据导出', 'toSieve');
 		}
         //回显
@@ -734,6 +738,7 @@
             var subType = "";
             var buyer = "";
             var winner = "";
+            var selectType = "";
             date = getDate();
             localStorage.date = date;
             localStorage.removeItem("export_starttime");
@@ -767,6 +772,9 @@
             if(localStorage.winner!==undefined&&localStorage.winner!==""){
                 winner = localStorage.winner;
             }
+            if(localStorage.selectType!==undefined&&localStorage.selectType!==""){
+                selectType = localStorage.selectType;
+            }
             $.ajax({
                 type: 'post',
                 url: '/jyapp/front/dataExport/saveData',
@@ -782,6 +790,7 @@
                     "subType":subType,
                     "buyer":buyer,
                     "winner":winner,
+                    "selectType":selectType,
                 },
                 dataType: 'json',
                 success: function(data){

src/jfw/public/search.go

@@ -192,7 +192,7 @@ func getDataExportSql(scd *SieveCondition) string {
 		}
 		multi_match = fmt.Sprintf(multi_match, "%s", "\""+scd.SelectType+"\"")
 
-		if scd.Comeinfrom == "supersearchPage" {
+		if scd.Comeinfrom == "supersearchPage" || scd.Comeinfrom == "exportPage" {
 
 			keywordArr := strings.Split(scd.Keyword[0].Keyword, "+")
 			if len(keywordArr) > 1 {
@@ -271,7 +271,7 @@ func GetDataExportSearchCountUseId(_id string) (count int) {
 	}
 	count = int(elastic.Count(INDEX, TYPE, qstr))
 	//超级搜索一致的检索（防止数据导出和超级搜索数据量不一致）
-	if scd.Comeinfrom == "supersearchPage" {
+	if scd.Comeinfrom == "supersearchPage" || scd.Comeinfrom == "exportPage" {
 		if len(scd.Keyword) != 0 || len(scd.Industry) != 0 {
 
 			searchTextSize := 0
@@ -353,7 +353,7 @@ func GetDataExportSearchResultUseId(_id, dataType string, count int) *[]map[stri
 				}
 			}
 			return &res
-		} else if scd.Comeinfrom == "supersearchPage" {
+		} else if scd.Comeinfrom == "supersearchPage" || scd.Comeinfrom == "exportPage" {
 			//超级搜索非空查询
 			count = int(elastic.Count(INDEX, TYPE, qstr))
 			searchTextSize := 0

src/web/templates/weixin/dataExport/dataExport.html

@@ -473,13 +473,13 @@
 			}
 			//采购单位
 	        if(filter["buyer"]!=null&&filter["buyer"].length>0){
-				localStorage.buyer = JSON.stringify(filter["buyer"])
+				localStorage.buyer = filter["buyer"].join(",");
 	        }else{
 				localStorage.buyer = "";
 			}
 	        //中标单位
 	        if(filter["winner"]!=null&&filter["winner"].length>0){
-				localStorage.winner = JSON.stringify(filter["winner"])
+				localStorage.winner = filter["winner"].join(",");
 	        }else{
 				localStorage.winner = "";
 			}
@@ -515,6 +515,11 @@
 	            localStorage.removeItem("export_starttime");
 	            localStorage.removeItem("export_endtime");
 			}
+	        if(filter["selectType"]!=null&&filter["selectType"]!=""){
+				localStorage.selectType = filter["selectType"];
+	        }else{
+				localStorage.selectType = "";
+			}
 			window.history.replaceState({}, '数据导出', 'toSieve');
 		}
         //回显
@@ -683,6 +688,7 @@
             var subType = "";
             var buyer = "";
             var winner = "";
+            var selectType = "";
             var date = getDate();
             localStorage.date = date;
             localStorage.removeItem("export_starttime");
@@ -716,6 +722,9 @@
             if(localStorage.winner!==undefined&&localStorage.winner!==""){
                 winner = localStorage.winner;
             }
+            if(localStorage.selectType!==undefined&&localStorage.selectType!==""){
+                selectType = localStorage.selectType;
+            }
             $.ajax({
                 type: 'post',
                 url: '/front/wx_dataExport/saveData',
@@ -731,6 +740,7 @@
                     "subType":subType,
                     "buyer":buyer,
                     "winner":winner,
+                    "selectType":selectType,
                 },
                 dataType: 'json',
                 success: function(data){