Merge branch 'refs/heads/eta_2.2.0_document_manage_0919@guomengyuan' into debug

models/document_manage_model/outside_report.go

@@ -20,6 +20,7 @@ type OutsideReport struct {
 	ReportUpdateTime string `orm:"column(report_update_time)" description:"报告更新时间，如果来源于邮件，那么取邮件的收件时间"`
 	ModifyTime       string `orm:"column(modify_time)" description:"最近一次修改时间"`
 	CreateTime       string `orm:"column(create_time)" description:"创建时间"`
+	ReportCode       string `orm:"column(report_code)" description:"报告唯一编码"`
 }
 
 type OutsideReportPage struct {
@@ -37,6 +38,9 @@ type OutsideReportBO struct {
 	Content         string `orm:"column(content)" description:"报告富文本内容"`
 	SysUserId       int    `orm:"column(sys_user_id)" description:"创建人id"`
 	SysUserName     string `orm:"column(sys_user_name)" description:"创建人姓名"`
+	ModifyTime      string `orm:"column(modify_time)" description:"最近一次修改时间"`
+	CreateTime      string `orm:"column(create_time)" description:"创建时间"`
+	ReportCode      string `orm:"column(report_code)" description:"报告唯一编码"`
 	AttachmentList  []*OutsideReportAttachment
 }
 

services/document_manage_service/document_manage_service.go

@@ -323,6 +323,9 @@ func DocumentReportDetail(outsideReportId int) (*document_manage_model.OutsideRe
 		Content:         outsideReport.Content,
 		SysUserId:       outsideReport.SysUserId,
 		SysUserName:     outsideReport.SysUserName,
+		CreateTime:      outsideReport.CreateTime,
+		ModifyTime:      outsideReport.ModifyTime,
+		ReportCode:      outsideReport.ReportCode,
 		AttachmentList:  attachmentList,
 	}
 	return &outsideReportBO, nil