浏览代码

Merge branch 'feature/eta_1.1.9' into debug

hsun 1 年之前
父节点
当前提交
aaeee61dfb
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      controllers/smart_report/smart_report.go

+ 4 - 1
controllers/smart_report/smart_report.go

@@ -866,6 +866,7 @@ func (this *SmartReportController) List() {
 		br.Msg = "请选择正确的时间类型"
 		return
 	}
+	// 更新时间指的是内容更新时间
 	if params.TimeType == "modify_time" {
 		params.TimeType = "content_modify_time"
 	}
@@ -881,8 +882,10 @@ func (this *SmartReportController) List() {
 			pars = append(pars, kw, kw, kw)
 		}
 		if params.StartDate != "" && params.EndDate != "" {
+			st := fmt.Sprintf("%s 00:00:00", params.StartDate)
+			ed := fmt.Sprintf("%s 23:59:59", params.EndDate)
 			condition += fmt.Sprintf(` AND %s >= ? AND %s <= ?`, params.TimeType, params.TimeType)
-			pars = append(pars, params.StartDate, params.EndDate)
+			pars = append(pars, st, ed)
 		}
 		if params.Frequency != "" {
 			condition += ` AND frequency = ?`