修改研报显示时间格式

domian/report/eta_report_service.go

@@ -118,7 +118,7 @@ func convertToETAReportDTO(report eta.ETAReport) (dto ETAReportDTO) {
 		Title:            report.Title,
 		Abstract:         report.Abstract,
 		Author:           report.Author,
-		PublishTime:      report.PublishTime.Format(time.DateTime),
+		PublishTime:      report.PublishedTime.Format(time.DateTime),
 		Content:          html.UnescapeString(report.Content),
 		ReportLayout:     report.ReportLayout,
 		VideoUrl:         report.VideoUrl,

domian/report/report_service.go

@@ -589,7 +589,7 @@ func convertEtaReport(etaRp eta.ETAReport) reportDao.Report {
 		Abstract:      etaRp.Abstract,
 		Author:        etaRp.Author,
 		CoverSrc:      0,
-		PublishedTime: etaRp.PublishTime.Format(time.DateTime),
+		PublishedTime: etaRp.PublishedTime.Format(time.DateTime),
 		Source:        reportDao.SourceETA,
 		SendStatus:    reportDao.UNSEND,
 		Status:        reportDao.StatusInit,

models/eta/eta_report.go

@@ -1,6 +1,7 @@
 package eta
 
 import (
+	logger "eta/eta_mini_ht_api/common/component/log"
 	"eta/eta_mini_ht_api/models"
 	"strings"
 	"time"
@@ -25,25 +26,26 @@ func (ETAReport) TableName() string {
 }
 
 type ETAReport struct {
-	ID               int       `gorm:"primary_key;auto_increment"`
-	ClassifyID       int       `gorm:"_"`
-	ClassifyIDFirst  int       `gorm:"column:classify_id_first;default:0"`
-	ClassifyIDSecond int       `gorm:"column:classify_id_second;default:0"`
-	ClassifyIDThird  int       `gorm:"column:classify_id_third;default:0"`
-	Title            string    `gorm:"column:title;size:125;"`
-	Abstract         string    `gorm:"column:abstract;size:255;"`
-	Author           string    `gorm:"column:author;size:50;"`
-	PublishTime      time.Time `gorm:"column:publish_time"`
-	Content          string    `gorm:"column:content"`
-	CollaborateType  int       `gorm:"column:collaborate_type"`
-	ReportLayout     int       `gorm:"column:report_layout"`
-	VideoUrl         string    `gorm:"column:video_url"`
-	VideoName        string    `gorm:"column:video_name"`
-	VideoPlaySeconds string    `gorm:"column:video_play_seconds"`
-	HeadResourceId   int       `gorm:"column:head_resource_id"`
-	EndResourceId    int       `gorm:"column:end_resource_id"`
-	HasChapter       bool      `gorm:"column:has_chapter"`
-	NeedSplice       bool      `gorm:"column:need_splice"`
+	ID               int    `gorm:"primary_key;auto_increment"`
+	ClassifyID       int    `gorm:"_"`
+	ClassifyIDFirst  int    `gorm:"column:classify_id_first;default:0"`
+	ClassifyIDSecond int    `gorm:"column:classify_id_second;default:0"`
+	ClassifyIDThird  int    `gorm:"column:classify_id_third;default:0"`
+	Title            string `gorm:"column:title;size:125;"`
+	Abstract         string `gorm:"column:abstract;size:255;"`
+	Author           string `gorm:"column:author;size:50;"`
+	PublishTime      string `gorm:"column:publish_time"`
+	PublishedTime    time.Time
+	Content          string `gorm:"column:content"`
+	CollaborateType  int    `gorm:"column:collaborate_type"`
+	ReportLayout     int    `gorm:"column:report_layout"`
+	VideoUrl         string `gorm:"column:video_url"`
+	VideoName        string `gorm:"column:video_name"`
+	VideoPlaySeconds string `gorm:"column:video_play_seconds"`
+	HeadResourceId   int    `gorm:"column:head_resource_id"`
+	EndResourceId    int    `gorm:"column:end_resource_id"`
+	HasChapter       bool   `gorm:"column:has_chapter"`
+	NeedSplice       bool   `gorm:"column:need_splice"`
 }
 
 //type ReportClassify struct {
@@ -67,7 +69,7 @@ func GetETAReports(id int) (reports []ETAReport, err error) {
 }
 
 func GetUpdateETAReports() (reports []ETAReport, err error) {
-	duration := time.Now().Add(-15 * time.Second)
+	duration := time.Now().Add(-30 * time.Second)
 	modifyTime := duration.Format(time.DateTime)
 	err = models.ETA().Table("report").Select(colunms+strings.Join(classifyIds, ",")).Where("(state =? or state=?) and modify_time >=?", published, passed, modifyTime).Order("id asc").Find(&reports).Error
 	if reports != nil {
@@ -77,8 +79,18 @@ func GetUpdateETAReports() (reports []ETAReport, err error) {
 	}
 	return
 }
+
 func GetETAReportById(id int) (report ETAReport, err error) {
 	err = models.ETA().Table("report").Select(detailColumn).Where("id = ?", id).Where("state =? or state=?", published, passed).First(&report).Error
+	if err != nil {
+		return
+	}
+	var date time.Time
+	date, err = time.Parse(time.DateTime, report.PublishTime)
+	if err != nil {
+		logger.Error("时间转换错误:%v", err)
+	}
+	report.PublishedTime = date
 	return
 }
 func DoSql(sql string, result interface{}, values ...interface{}) (err error) {

models/ht/ht_report.go

@@ -23,7 +23,7 @@ func GetHTReports(id int) (reports []HTReport, err error) {
 	return
 }
 func GetUpdateHTReports() (reports []HTReport, err error) {
-	duration := time.Now().Add(-15 * time.Second)
+	duration := time.Now().Add(-30 * time.Second)
 	updateTime := duration.UnixMilli()
 	db := models.HT()
 	sql := "select tirtp.plate_id as plate_id, tip.plate_name as plate_name, t.id as id ,t.report_name as report_name,t.publish_user_name as publish_user_name,t.publish_time as publish_time from t_iirp_report_to_plate tirtp left join t_iirp_report_info t on t.id=tirtp.report_id left JOIN t_iirp_plate tip on tip.id=tirtp.plate_id  where t.is_delete =0 and t.`status` =3 and t.report_file_path<>'' and t.update_time > ? order by t.id asc"