|
|
@@ -276,6 +276,28 @@ func (this *dataExportPackStruct) GetDataExportRecordList(userId, memberPid stri
|
|
|
if filterId, _ := filterMap["FilterId"].(string); filterId != "" {
|
|
|
returnRow["search"] = getSearchValueById(filterId)
|
|
|
} else {
|
|
|
+ filterMap["area"] = filterMap["Area"]
|
|
|
+ t, _ := filterMap["Time"].(string)
|
|
|
+ if strings.Contains(t, "_") {
|
|
|
+ t1 := strings.Split(t, "_")[0]
|
|
|
+ t2 := strings.Split(t, "_")[1]
|
|
|
+ if len([]rune(t1)) > 10 {
|
|
|
+ t1 = string([]rune(t)[:10])
|
|
|
+ }
|
|
|
+ if len([]rune(t2)) > 10 {
|
|
|
+ t2 = string([]rune(t2)[:10])
|
|
|
+ }
|
|
|
+ t = t1 + "_" + t2
|
|
|
+ } else {
|
|
|
+ if len([]rune(t)) > 10 {
|
|
|
+ t = string([]rune(t)[:10])
|
|
|
+ }
|
|
|
+ }
|
|
|
+ filterMap["publishtime"] = t
|
|
|
+ filterMap["buyerclass"] = filterMap["Buyerclass"]
|
|
|
+ delete(filterMap, "Area")
|
|
|
+ delete(filterMap, "Time")
|
|
|
+ delete(filterMap, "Buyerclass")
|
|
|
returnRow["search"] = filterMap
|
|
|
}
|
|
|
}
|
|
|
@@ -526,10 +548,10 @@ func getCurrEntCount(entName, entPhone string) int {
|
|
|
|
|
|
//根据筛选id获取筛选条件
|
|
|
func getSearchValueById(filterId string) (searchMap map[string]interface{}) {
|
|
|
- filter, _ := util.MQFW.FindById("export_search", filterId, `{"industry":1,"publishtime":1,"area":1,"comeinfrom":1}`)
|
|
|
+ filter, _ := util.MQFW.FindById("export_search", filterId, `{"buyerclass":1,"publishtime":1,"area":1,"comeinfrom":1}`)
|
|
|
if filter != nil && len(*filter) > 0 {
|
|
|
searchMap = make(map[string]interface{})
|
|
|
- searchMap["industry"] = (*filter)["industry"]
|
|
|
+ searchMap["buyerclass"] = (*filter)["buyerclass"]
|
|
|
searchMap["publishtime"] = (*filter)["publishtime"]
|
|
|
searchMap["area"] = (*filter)["area"]
|
|
|
searchMap["id"] = qutil.SE.Encode2Hex(filterId)
|
