Merge remote-tracking branch 'origin/master'

controllers/english_report/report.go

@@ -372,7 +372,7 @@ func (this *EnglishReportController) ListReport() {
 	var pars []interface{}
 
 	if keyWord != "" {
-		condition += ` AND (title LIKE '%` + keyWord + `%' OR author LIKE '%` + keyWord + `%' ) `
+		condition += ` AND (title LIKE '%` + keyWord + `%' OR admin_real_name LIKE '%` + keyWord + `%' ) `
 	}
 	if timeType == "" {
 		timeType = "publish_time"

controllers/report.go

@@ -85,7 +85,7 @@ func (this *ReportController) ListReport() {
 	var pars []interface{}
 
 	if keyWord != "" {
-		condition += ` AND (title LIKE '%` + keyWord + `%' OR author LIKE '%` + keyWord + `%' ) `
+		condition += ` AND (title LIKE '%` + keyWord + `%' OR admin_real_name LIKE '%` + keyWord + `%' ) `
 	}
 	if startDate != "" {
 		condition += ` AND ` + timeType + ` >= ? `

models/english_report.go

@@ -195,6 +195,7 @@ type EnglishReportDetail struct {
 	ModifyTime         string `description:"修改时间"`
 	State              int    `description:"1:未发布，2:已发布"`
 	PublishTime        string `description:"发布时间"`
+	PrePublishTime     string `description:"预发布时间"`
 	Stage              int    `description:"期数"`
 	MsgIsSend          int    `description:"消息是否已发送，0:否，1:是"`
 	ReportCode         string `description:"报告唯一编码"`

models/report.go

@@ -170,8 +170,10 @@ type ReportDetail struct {
 	ModifyTime         string `description:"修改时间"`
 	State              int    `description:"1:未发布，2:已发布"`
 	PublishTime        string `description:"发布时间"`
+	PrePublishTime     string `description:"预发布时间"`
 	Stage              int    `description:"期数"`
 	MsgIsSend          int    `description:"消息是否已发送，0:否，1:是"`
+	PreMsgSend         int    `description:"定时发布成功后是否立即推送模版消息：0否，1是"`
 	Content            string `description:"内容"`
 	VideoUrl           string `description:"音频文件URL"`
 	VideoName          string `description:"音频文件名称"`