Merge branch 'feature/eta_1.3.8' into debug

services/report_approve.go

@@ -344,6 +344,10 @@ func updateReportApproveState(reportType, reportId, approveId, state int) (err e
 				updateCols = append(updateCols, "ApproveTime")
 				reportItem.ApproveTime = time.Now().Local()
 			}
+			if state == models.ReportStatePass {
+				updateCols = append(updateCols, "PublishTime")
+				reportItem.PublishTime = time.Now().Local()
+			}
 			if e = reportItem.UpdateReport(updateCols); e != nil {
 				err = fmt.Errorf("更新中文研报审批状态失败, Err: %s", e.Error())
 				return
@@ -364,6 +368,10 @@ func updateReportApproveState(reportType, reportId, approveId, state int) (err e
 				updateCols = append(updateCols, "ApproveTime")
 				reportItem.ApproveTime = time.Now().Local()
 			}
+			if state == models.ReportStatePass {
+				updateCols = append(updateCols, "PublishTime")
+				reportItem.PublishTime = time.Now().Local()
+			}
 			if e = reportItem.UpdateReport(updateCols); e != nil {
 				err = fmt.Errorf("更新英文研报审批状态失败, Err: %s", e.Error())
 				return
@@ -385,6 +393,10 @@ func updateReportApproveState(reportType, reportId, approveId, state int) (err e
 				updateCols = append(updateCols, "ApproveTime")
 				reportItem.ApproveTime = time.Now().Local()
 			}
+			if state == models.ReportStatePass {
+				updateCols = append(updateCols, "PublishTime")
+				reportItem.PublishTime = time.Now().Local()
+			}
 			if e = reportItem.Update(updateCols); e != nil {
 				err = fmt.Errorf("更新智能研报审批状态失败, Err: %s", e.Error())
 				return