|
@@ -13,7 +13,6 @@ import (
|
|
|
"time"
|
|
|
|
|
|
qutil "app.yhyue.com/moapp/jybase/common"
|
|
|
- . "app.yhyue.com/moapp/jybase/date"
|
|
|
"app.yhyue.com/moapp/jybase/encrypt"
|
|
|
"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
|
|
|
)
|
|
@@ -355,13 +354,21 @@ func (this *Portrait) SaveExportRecord(pwp *PortraitProjectScreen, ids []string,
|
|
|
for _, k := range pwp.Screen.KeyWordArr {
|
|
|
keyWords = append(keyWords, dataExportKeywords{Keyword: k})
|
|
|
}
|
|
|
+ if (pwp.Screen.PareStartTime == 0 || pwp.Screen.PareEndTime == 0) && pwp.Screen.TimeRange != "" {
|
|
|
+ // 前端传的有timerange 但是PareStartTime 或者PareEndTime没有被赋值过 需要赋值 --筛选条件有时间 然后勾选导出的时候会有这种情况
|
|
|
+ pwp.Screen.PareTimeSelect(true)
|
|
|
+ }
|
|
|
+ publishtime := fmt.Sprintf("%d_%d", pwp.Screen.PareStartTime, pwp.Screen.PareEndTime)
|
|
|
+ if publishtime == "0_0" {
|
|
|
+ publishtime = ""
|
|
|
+ }
|
|
|
saveMap := map[string]interface{}{
|
|
|
"s_userid": this.UserId,
|
|
|
"comeinfrom": flag,
|
|
|
"comeintime": time.Now().Unix(),
|
|
|
"selectIds": ids,
|
|
|
"area": qutil.If(pwp.Screen.Area != "", strings.Split(pwp.Screen.Area, ","), nil),
|
|
|
- "publishtime": fmt.Sprintf("%d_%d", pwp.Screen.PareStartTime, pwp.Screen.PareEndTime),
|
|
|
+ "publishtime": publishtime,
|
|
|
"industry": qutil.If(pwp.Screen.ScopeClass != "", strings.Split(pwp.Screen.ScopeClass, ","), nil),
|
|
|
"keywords": keyWords,
|
|
|
"selectType": pwp.Screen.ShowMatch,
|