Merge branch 'ETA_1.2.6' into debug

controllers/report_approval.go

@@ -201,6 +201,16 @@ func (this *ReportController) PublishReport() {
 			br.ErrMsg = "报告审核失败, Err:" + tmpErr.Error() + ", report_id:" + strconv.Itoa(report.Id)
 			return
 		}
+		recordItem := &models.ReportStateRecord{
+			ReportId:   vint,
+			ReportType: 1,
+			State:      req.State,
+			CreateTime: time.Now(),
+		}
+		go func() {
+			_, _ = models.AddReportStateRecord(recordItem)
+		}()
+
 		go func() {
 			// 更新报告Es
 			_ = services.UpdateReportEs(report.Id, req.State)

controllers/smart_report_approval.go

@@ -267,6 +267,16 @@ func (this *SmartReportController) Publish() {
 			return
 		}
 
+		recordItem := &models.ReportStateRecord{
+			ReportId:   vint,
+			ReportType: 2,
+			State:      req.PublishState,
+			CreateTime: time.Now(),
+		}
+		go func() {
+			_, _ = models.AddReportStateRecord(recordItem)
+		}()
+
 		// ES更新报告
 		go func() {
 			_ = services.SmartReportElasticUpsert(item.SmartReportId, req.PublishState)

models/db.go

@@ -32,5 +32,6 @@ func init() {
 	orm.RegisterModel(
 		new(Report),
 		new(SmartReport),
+		new(ReportStateRecord),
 	)
 }

models/report_state_record.go

@@ -0,0 +1,22 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type ReportStateRecord struct {
+	Id         int       `orm:"column(id)" description:"Id"`
+	ReportId   int       // 研报id
+	ReportType int       // 报告类型'报告类型：1中文研报2智能研报'
+	State      int       // 状态：1-未提交 2-待审核 3-驳回 4-审核
+	AdminId    int       // 操作人id
+	AdminName  string    // 操作人姓名
+	CreateTime time.Time // 创建时间
+}
+
+func AddReportStateRecord(item *ReportStateRecord) (lastId int64, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	lastId, err = o.Insert(item)
+	return
+}