浏览代码

fix:pdf研报详情时间展示

zqbao 9 月之前
父节点
当前提交
ae61610f41
共有 2 个文件被更改,包括 26 次插入20 次删除
  1. 7 1
      controllers/my_report.go
  2. 19 19
      models/report_pdf.go

+ 7 - 1
controllers/my_report.go

@@ -238,13 +238,19 @@ func (this *MyReportController) PdfCollect() {
 		}
 	}
 
+	publishTime, err := time.Parse(utils.FormatDateTime, reportPdf.PublishTime)
+	if err != nil {
+		br.Msg = "收藏失败"
+		br.ErrMsg = "时间格式不对, err:" + err.Error()
+		return
+	}
 	myChart := &models.MyReport{
 		UserId:      user.UserId,
 		ReportId:    req.ReportPdfId,
 		Title:       reportPdf.Title,
 		Abstract:    reportPdf.Abstract,
 		Author:      reportPdf.Author,
-		PublishTime: reportPdf.PublishTime,
+		PublishTime: publishTime,
 		Stage:       reportPdf.Stage,
 		CreateTime:  time.Now(),
 		ReportType:  utils.ReportTypePdf,

+ 19 - 19
models/report_pdf.go

@@ -27,25 +27,25 @@ type ReportPdf struct {
 }
 
 type ReportPdfView struct {
-	ReportPdfId        int       `orm:"pk" description:"id"`
-	PdfUrl             string    `description:"pdf文件URL"`
-	Title              string    `description:"pdf文件标题"`
-	Author             string    `description:"作者"`
-	Abstract           string    `description:"摘要"`
-	ClassifyIdFirst    int       `description:"一级分类id"`
-	ClassifyNameFirst  string    `description:"一级分类名称"`
-	ClassifyIdSecond   int       `description:"二级分类id"`
-	ClassifyNameSecond string    `description:"二级分类名称"`
-	Stage              int       `description:"期数"`
-	PublishTime        time.Time `description:"发布时间"`
-	ModifyTime         time.Time `description:"更新时间"`
-	Pv                 int       `description:"pv"`
-	Uv                 int       `description:"uv"`
-	SysUserId          int       `description:"创建人id"`
-	SysRealName        string    `description:"创建人姓名"`
-	State              int       `description:"状态:1-已发布;2-未发布"`
-	IsPublic           bool      `description:"是否公开"`
-	IsCollect          bool      `description:"是否收藏"`
+	ReportPdfId        int    `orm:"pk" description:"id"`
+	PdfUrl             string `description:"pdf文件URL"`
+	Title              string `description:"pdf文件标题"`
+	Author             string `description:"作者"`
+	Abstract           string `description:"摘要"`
+	ClassifyIdFirst    int    `description:"一级分类id"`
+	ClassifyNameFirst  string `description:"一级分类名称"`
+	ClassifyIdSecond   int    `description:"二级分类id"`
+	ClassifyNameSecond string `description:"二级分类名称"`
+	Stage              int    `description:"期数"`
+	PublishTime        string `description:"发布时间"`
+	ModifyTime         string `description:"更新时间"`
+	Pv                 int    `description:"pv"`
+	Uv                 int    `description:"uv"`
+	SysUserId          int    `description:"创建人id"`
+	SysRealName        string `description:"创建人姓名"`
+	State              int    `description:"状态:1-已发布;2-未发布"`
+	IsPublic           bool   `description:"是否公开"`
+	IsCollect          bool   `description:"是否收藏"`
 }
 
 func GetReportPdfListByCondition(condition string, pars []interface{}, startSize, pageSize int) (reportPdfs []*ReportPdf, err error) {