|
|
@@ -1,25 +1,26 @@
|
|
|
package history
|
|
|
|
|
|
import (
|
|
|
- "app.yhyue.com/moapp/jybase/common"
|
|
|
- "app.yhyue.com/moapp/jybase/date"
|
|
|
- "app.yhyue.com/moapp/jybase/go-xweb/xweb"
|
|
|
- "app.yhyue.com/moapp/jybase/log"
|
|
|
- "app.yhyue.com/moapp/jybase/mongodb"
|
|
|
"cmplatform/util"
|
|
|
- "context"
|
|
|
+ // "context"
|
|
|
"encoding/json"
|
|
|
"fmt"
|
|
|
- "github.com/antonmedv/expr"
|
|
|
- "github.com/tealeg/xlsx"
|
|
|
- "go.mongodb.org/mongo-driver/bson"
|
|
|
- "go.uber.org/zap"
|
|
|
"io"
|
|
|
"os"
|
|
|
"regexp"
|
|
|
"strings"
|
|
|
"sync"
|
|
|
"time"
|
|
|
+
|
|
|
+ "app.yhyue.com/moapp/jybase/common"
|
|
|
+ "app.yhyue.com/moapp/jybase/date"
|
|
|
+ "app.yhyue.com/moapp/jybase/go-xweb/xweb"
|
|
|
+ "app.yhyue.com/moapp/jybase/log"
|
|
|
+ "app.yhyue.com/moapp/jybase/mongodb"
|
|
|
+ "github.com/antonmedv/expr"
|
|
|
+ "github.com/tealeg/xlsx"
|
|
|
+ "go.mongodb.org/mongo-driver/bson"
|
|
|
+ "go.uber.org/zap"
|
|
|
)
|
|
|
|
|
|
type HistoryData struct {
|
|
|
@@ -163,9 +164,9 @@ func (this *HistoryData) HistoryTask(history_id string) {
|
|
|
cus.GetData("history", i_dataSource) //获取数据
|
|
|
//cus.RemoveRepeatData() //数据去重
|
|
|
cus.saveBeforeData(history_id, isFilter, noticeFilter, dataTable, entId, iContact, xlsxData)
|
|
|
- if err := util.MgoSave.C.Database(util.MgoSave.DbName).Collection(cus.saveTempColl).Drop(context.Background()); err != nil { // 删除临时表
|
|
|
- log.Error("临时表删除失败", zap.Error(err), zap.String("coll", cus.saveTempColl))
|
|
|
- }
|
|
|
+ // if err := util.MgoSave.C.Database(util.MgoSave.DbName).Collection(cus.saveTempColl).Drop(context.Background()); err != nil { // 删除临时表
|
|
|
+ // log.Error("临时表删除失败", zap.Error(err), zap.String("coll", cus.saveTempColl))
|
|
|
+ // }
|
|
|
//cus.AssembelAndSaveData(history_id, isFilter, noticeFilter, dataTable, entId, iContact, xlsxData) //组装、保存数据
|
|
|
if dataTable == 2 {
|
|
|
//使用pc商机管理的企业，数据存入mysql表，扣除数据量
|
