Browse Source

fix:数据自动导出参数替换

duxin 2 years ago
parent
commit
cd7cf7ea40

+ 1 - 0
src/jfw/front/dataExport.go

@@ -159,6 +159,7 @@ func (d *DataExport) SieveData() {
 		winnerArr = strings.Split(winner, ",")
 		log.Println("winnerArr", winnerArr)
 	}
+	selectType = strings.Replace(selectType, "title,title", "title", -1)
 	sieveCondition := map[string]interface{}{
 		"publishtime": publishtime,
 		"area":        areaArr,

+ 18 - 17
src/jfw/front/wx_dataExport.go

@@ -40,7 +40,7 @@ func init() {
 	xweb.AddAction(&WxDataExport{})
 }
 
-//微信数据导出
+// 微信数据导出
 func (w *WxDataExport) ToSieve() error {
 	defer util.Catch()
 	orderCode := w.GetString("orderCode")
@@ -91,7 +91,7 @@ func (w *WxDataExport) ToSieve() error {
 	return nil
 }
 
-//保存筛选数据
+// 保存筛选数据
 func (w *WxDataExport) SaveData() error {
 	userId := util.ObjToString(w.GetSession("userId"))
 	if userId == "" {
@@ -179,6 +179,7 @@ func (w *WxDataExport) SaveData() error {
 			log.Println("keyWord param 反序列化异常,查看前后台字段是否对应")
 		}
 	}
+	selectType = strings.Replace(selectType, "title,title", "title", -1)
 	saveData := map[string]interface{}{
 		"publishtime": publishtime,
 		"area":        areaArr,
@@ -212,7 +213,7 @@ func (w *WxDataExport) SaveData() error {
 	return nil
 }
 
-//区域
+// 区域
 func (w *WxDataExport) Area() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -226,7 +227,7 @@ func (w *WxDataExport) Area() error {
 	return nil
 }
 
-//行业
+// 行业
 func (w *WxDataExport) Industry() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -240,7 +241,7 @@ func (w *WxDataExport) Industry() error {
 	return nil
 }
 
-//采购单位行业
+// 采购单位行业
 func (w *WxDataExport) Buyerclass() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -254,7 +255,7 @@ func (w *WxDataExport) Buyerclass() error {
 	return nil
 }
 
-//关键词
+// 关键词
 func (w *WxDataExport) KeyWord() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -268,7 +269,7 @@ func (w *WxDataExport) KeyWord() error {
 	return nil
 }
 
-//关键词输入
+// 关键词输入
 func (w *WxDataExport) KeyWordInput() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -282,7 +283,7 @@ func (w *WxDataExport) KeyWordInput() error {
 	return nil
 }
 
-//附加词
+// 附加词
 func (w *WxDataExport) Appended() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -296,7 +297,7 @@ func (w *WxDataExport) Appended() error {
 	return nil
 }
 
-//附加词输入
+// 附加词输入
 func (w *WxDataExport) AppendedInput() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -310,7 +311,7 @@ func (w *WxDataExport) AppendedInput() error {
 	return nil
 }
 
-//排除词
+// 排除词
 func (w *WxDataExport) Exclude() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -324,7 +325,7 @@ func (w *WxDataExport) Exclude() error {
 	return nil
 }
 
-//排除词输入
+// 排除词输入
 func (w *WxDataExport) ExcludeInput() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -338,7 +339,7 @@ func (w *WxDataExport) ExcludeInput() error {
 	return nil
 }
 
-//金额
+// 金额
 func (w *WxDataExport) Price() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -352,7 +353,7 @@ func (w *WxDataExport) Price() error {
 	return nil
 }
 
-//信息类型
+// 信息类型
 func (w *WxDataExport) SubType() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -366,7 +367,7 @@ func (w *WxDataExport) SubType() error {
 	return nil
 }
 
-//采购单位编辑
+// 采购单位编辑
 func (w *WxDataExport) BuyerEdit() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -380,7 +381,7 @@ func (w *WxDataExport) BuyerEdit() error {
 	return nil
 }
 
-//采购单位输入
+// 采购单位输入
 func (w *WxDataExport) BuyerInput() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -394,7 +395,7 @@ func (w *WxDataExport) BuyerInput() error {
 	return nil
 }
 
-//中标单位编辑
+// 中标单位编辑
 func (w *WxDataExport) WinnerEdit() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())
@@ -408,7 +409,7 @@ func (w *WxDataExport) WinnerEdit() error {
 	return nil
 }
 
-//中标单位输入
+// 中标单位输入
 func (w *WxDataExport) WinnerInput() error {
 	//分享
 	w.T["signature"] = wx.SignJSSDK(w.Site() + w.Url())

+ 2 - 1
src/jfw/modules/app/src/app/front/dataExport.go

@@ -184,7 +184,7 @@ func (w *WxDataExport) SaveData() error {
 			}
 		}
 	}
-
+	selectType = strings.Replace(selectType, "title,title", "title", -1)
 	saveData := map[string]interface{}{
 		"publishtime": publishtime,
 		"area":        areaArr,
@@ -210,6 +210,7 @@ func (w *WxDataExport) SaveData() error {
 		saveData["s_userid"] = w.GetSession("userId").(string)
 	}
 	_id := mongodb.Save(dataexport.ExportTable, saveData)
+	log.Println("数据导出参数:", saveData)
 	msgCount := dataexport.GetDataExportSearchCountByScdId(public.MQFW, public.Mgo_Bidding, public.DbConf.Mongodb.Bidding.DbName, public.DbConf.Elasticsearch.Main.Address, _id)
 	if msgCount > 20000 {
 		msgCount = 20000