Merge branch 'ETA_1.2.6'

models/db.go

@@ -139,5 +139,6 @@ func initTradePositionTop() {
 func initSmartReport() {
 	orm.RegisterModel(
 		new(SmartReport),
+		new(ReportStateRecord),
 	)
 }

models/report.go

@@ -33,6 +33,8 @@ type Report struct {
 	ChapterType        string    `description:"章节类型 day-晨报 week-周报"`
 	OldReportId        int       `description:"research_report表ID(后续一两个版本过渡需要,之后可移除)"`
 	PreMsgSend         int       `description:"定时发布成功后是否立即推送模版消息：0否，1是"`
+	AdminId            int
+	AdminName          string `description:"系统用户名称"`
 }
 
 func GetReportById(reportId int) (item *ReportDetail, err error) {

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
+}

services/report.go

@@ -194,7 +194,17 @@ func PublishReport(cont context.Context) (err error) {
 				}
 			}
 		}()
-
+		recordItem := &models.ReportStateRecord{
+			ReportId:   item.Id,
+			ReportType: 1,
+			State:      2,
+			AdminId:    item.AdminId,
+			AdminName:  item.AdminName,
+			CreateTime: time.Now(),
+		}
+		go func() {
+			_, _ = models.AddReportStateRecord(recordItem)
+		}()
 	}
 	return
 }

services/smart_report.go

@@ -61,6 +61,18 @@ func PublishSmartReport(cont context.Context) (err error) {
 			}
 			_ = SmartReportElasticUpsert(item.SmartReportId, 2)
 		}()
+
+		recordItem := &models.ReportStateRecord{
+			ReportId:   item.SmartReportId,
+			ReportType: 2,
+			State:      2,
+			AdminId:    item.AdminId,
+			AdminName:  item.AdminRealName,
+			CreateTime: time.Now(),
+		}
+		go func() {
+			_, _ = models.AddReportStateRecord(recordItem)
+		}()
 	}
 	return
 }