|
|
@@ -66,10 +66,10 @@ func GetCustomerData() {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- cus.GetTagRules() //获取客户打标签规则
|
|
|
+ cus.GetTagRules() //获取客户打标签规则
|
|
|
cus.GetDepartments("") //获取客户信息
|
|
|
//PrintLog(cus) //打印查看初始化的信息
|
|
|
- qu.Debug("customer:", cus.ID, cus.Name, cus.PushModel, cus.AppId, cus.IsTagRule, cus.IsSearchHosp, cus.IsSearchEnps, len(cus.TagRules), len(cus.Departments))
|
|
|
+ //qu.Debug("customer:", cus.ID, cus.Name, cus.PushModel, cus.AppId, cus.IsTagRule, cus.IsSearchHosp, cus.IsSearchEnps, len(cus.TagRules), len(cus.Departments))
|
|
|
cus.GetData() //获取数据
|
|
|
cus.RemoveRepeatData() //数据去重
|
|
|
cus.AssembelAndSaveData() //组装、保存数据
|
|
|
@@ -449,7 +449,7 @@ func (d *Department) GetSearchRules(cid, stype string, idRange bson.M) {
|
|
|
//获取es
|
|
|
if stype == "history" {
|
|
|
SR.EsQuery = esquery
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
SR.GetEs(d.Name, esquery, idRange)
|
|
|
}
|
|
|
//获取关键词和附加词
|
|
|
@@ -474,7 +474,6 @@ func (sr *SearchRule) GetEs(department, esquery string, tmpRange bson.M) {
|
|
|
index := 1 //记录range的位置
|
|
|
for _, m := range filter.Bool.Must {
|
|
|
mMap := m.(map[string]interface{})
|
|
|
- qu.Debug(mMap, mMap["range"])
|
|
|
if esRange, ok := mMap["range"].(map[string]interface{}); ok && esRange != nil { //有range
|
|
|
if esRange["publishtime"] != nil {
|
|
|
index = 0
|
