no message

models/ficc_report/report.go

@@ -67,6 +67,7 @@ type ReportItem struct {
 	CanvasColor        string    `description:"画布颜色" json:"canvas_color"`
 	HeadStyle          string    `description:"版头样式" json:"head_style"`
 	EndStyle           string    `description:"版尾样式" json:"end_style"`
+	ArticleId          int       `description:"文章ID"`
 }
 
 type Report struct {

services/ficc_report.go

@@ -45,6 +45,7 @@ func GetMinClassify(reportInfo *ficc_report.Report) (minClassifyId int, minClass
 	return
 }
 
+// 获取报告详情
 // 获取报告详情
 func GetReportDetail(userinfo *models.WxUserItem, reportId int) (reportDetail ficc_report.ReportDetail, err error) {
 	//var errMsg string
@@ -55,10 +56,16 @@ func GetReportDetail(userinfo *models.WxUserItem, reportId int) (reportDetail fi
 		}
 	}()
 
-	reportInfo, err := ficc_report.GetByReportId(reportId)
-	if err != nil {
+	detailArticle, e := models.GetArticleDetailByReportId(reportId)
+	if e != nil {
+		err = errors.New("报告查询出错" + e.Error())
+		return
+	}
+
+	reportInfo, e := ficc_report.GetByReportId(reportId)
+	if e != nil {
 		//errMsg = err.Error()
-		err = errors.New("报告查询出错")
+		err = errors.New("报告查询出错" + e.Error())
 		return
 	}
 	if reportInfo.Id == 0 {
@@ -178,6 +185,7 @@ func GetReportDetail(userinfo *models.WxUserItem, reportId int) (reportDetail fi
 	reportItem.HeadImg = reportInfo.HeadImg
 	reportItem.EndImg = reportInfo.EndImg
 	reportItem.CanvasColor = reportInfo.CanvasColor
+	reportItem.ArticleId = detailArticle.ArticleId
 
 	//版头版尾样式
 	{