Merge branch 'eta/1.8.3' into debug

controllers/report_chapter.go

@@ -1356,13 +1356,13 @@ func (this *ReportController) PublishDayWeekReportChapter() {
 	br.Msg = "操作成功"
 }
 
-// GetUnPublishReportChapterCount
+// GetUnPublishReportChapterList
 // @Title 获取报告中未发布的章节数
 // @Description 获取报告中未发布的章节数
 // @Param	ReportId  query  int  true  "报告ID"
 // @Success 200 Ret=200 获取成功
-// @router /chapter/un_publish/count [get]
-func (this *ReportController) GetUnPublishReportChapterCount() {
+// @router /chapter/un_publish/list [get]
+func (this *ReportController) GetUnPublishReportChapterList() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -1395,8 +1395,8 @@ func (this *ReportController) GetUnPublishReportChapterCount() {
 		return
 	}
 
-	// 获取未发布的章节数
-	unPublishedNum, err := models.CountUnPublishedChapterNum(reportInfo.Id)
+	// 获取未发布的章节列表
+	unPublishedList, err := models.GetUnPublishedChapterList(reportInfo.Id)
 	if err != nil {
 		br.Msg = "获取未发布的章节数失败"
 		br.ErrMsg = "获取未发布的章节数失败, Err: " + err.Error()
@@ -1406,5 +1406,5 @@ func (this *ReportController) GetUnPublishReportChapterCount() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"
-	br.Data = unPublishedNum
+	br.Data = unPublishedList
 }

models/report_chapter.go

@@ -326,6 +326,21 @@ func CountUnPublishedChapterNum(reportId int) (count int, err error) {
 	return
 }
 
+// GetUnPublishedChapterList
+// @Description: 获取报告未发布的章节列表
+// @author: Roc
+// @datetime 2024-06-14 15:59:23
+// @param reportId int
+// @return list []*ReportChapter
+// @return err error
+func GetUnPublishedChapterList(reportId int) (list []*ReportChapter, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := ` SELECT report_chapter_id,report_id,title FROM report_chapter WHERE report_id = ? AND publish_state = 1 ORDER BY sort ASC`
+	_, err = o.Raw(sql, reportId).QueryRows(&list)
+
+	return
+}
+
 // GetChapterListByChapterIds 根据ReportId获取章节列表
 func GetChapterListByChapterIds(chapterIds []int) (list []*ReportChapter, err error) {
 	if len(chapterIds) == 0 {

routers/commentsRouter.go

@@ -8118,8 +8118,8 @@ func init() {
 
     beego.GlobalControllerRouter["eta/eta_api/controllers:ReportController"] = append(beego.GlobalControllerRouter["eta/eta_api/controllers:ReportController"],
         beego.ControllerComments{
-            Method: "GetUnPublishReportChapterCount",
-            Router: `/chapter/un_publish/count`,
+            Method: "GetUnPublishReportChapterList",
+            Router: `/chapter/un_publish/list`,
             AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,