Merge branch 'eta/1.8.3' into debug

controllers/report.go

@@ -2219,7 +2219,7 @@ func (this *ReportController) CheckDayWeekReportChapterVideo() {
 		br.ErrMsg = "获取章节列表失败, Err: " + err.Error()
 		return
 	}
-	var typeNameArr []string
+	typeNameArr := make([]string, 0)
 	for _, v := range chapterList {
 		if v.VideoUrl == "" || (v.VideoUrl != "" && v.VideoKind == 2) {
 			typeNameArr = append(typeNameArr, v.TypeName)

controllers/report_chapter.go

@@ -95,6 +95,7 @@ func (this *ReportController) AddChapter() {
 
 	reportChapterInfo.Title = req.Title
 	reportChapterInfo.AddType = 1
+	reportChapterInfo.PublishState = 1
 	//reportChapterInfo.Author = req.Author
 	//reportChapterInfo.Content = html.EscapeString(req.Content)
 	//reportChapterInfo.ContentSub = html.EscapeString(contentSub)
@@ -130,6 +131,74 @@ func (this *ReportController) AddChapter() {
 	br.Msg = "保存成功"
 }
 
+// EditChapterBaseInfoAndPermission
+// @Title 修改报告章节的基础信息、授权用户权限、品种权限
+// @Description 修改报告章节的基础信息、授权用户权限、品种权限
+// @Param	request	body models.EditReportChapterReq true "type json string"
+// @Success 200 Ret=200 保存成功
+// @router /chapter/base_info/edit [post]
+func (this *ReportController) EditChapterBaseInfoAndPermission() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	sysUser := this.SysUser
+	if sysUser == nil {
+		br.Msg = "请登录"
+		br.ErrMsg = "请登录，SysUser Is Empty"
+		br.Ret = 408
+		return
+	}
+
+	var req models.EditReportChapterBaseInfoAndPermissionReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	reportChapterId := req.ReportChapterId
+	if reportChapterId <= 0 {
+		br.Msg = "报告章节ID有误"
+		return
+	}
+	// 获取章节详情
+	reportChapterInfo, err := models.GetReportChapterInfoById(reportChapterId)
+	if err != nil {
+		br.Msg = "报告章节信息有误"
+		br.ErrMsg = "报告章节信息有误, Err: " + err.Error()
+		return
+	}
+	// 获取报告详情
+	reportInfo, err := models.GetReportByReportId(reportChapterInfo.ReportId)
+	if err != nil {
+		br.Msg = "报告信息有误"
+		br.ErrMsg = "报告信息有误, Err: " + err.Error()
+		return
+	}
+	if reportInfo.State == 2 {
+		br.Msg = "该报告已发布，不允许编辑"
+		br.ErrMsg = "该报告已发布，不允许编辑"
+		return
+	}
+
+	err, errMsg := services.EditChapterBaseInfoAndPermission(reportInfo, reportChapterInfo, req.Title, req.PermissionIdList, req.AdminIdList)
+	if err != nil {
+		br.Msg = "保存失败"
+		if errMsg != "" {
+			br.Msg = errMsg
+		}
+		br.ErrMsg = "保存失败,Err:" + err.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "保存成功"
+}
+
 // EditDayWeekChapter
 // @Title 编辑晨周报章节内容
 // @Description 编辑晨周报章节内容
@@ -436,74 +505,6 @@ func (this *ReportController) DelChapter() {
 	br.Msg = "删除成功"
 }
 
-// EditChapterBaseInfoAndPermission
-// @Title 修改报告章节的基础信息、授权用户权限、品种权限
-// @Description 修改报告章节的基础信息、授权用户权限、品种权限
-// @Param	request	body models.EditReportChapterReq true "type json string"
-// @Success 200 Ret=200 保存成功
-// @router /chapter/base_info/edit [post]
-func (this *ReportController) EditChapterBaseInfoAndPermission() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		br.Ret = 408
-		return
-	}
-
-	var req models.EditReportChapterBaseInfoAndPermissionReq
-	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
-	if err != nil {
-		br.Msg = "参数解析异常！"
-		br.ErrMsg = "参数解析失败，Err:" + err.Error()
-		return
-	}
-	reportChapterId := req.ReportChapterId
-	if reportChapterId <= 0 {
-		br.Msg = "报告章节ID有误"
-		return
-	}
-	// 获取章节详情
-	reportChapterInfo, err := models.GetReportChapterInfoById(reportChapterId)
-	if err != nil {
-		br.Msg = "报告章节信息有误"
-		br.ErrMsg = "报告章节信息有误, Err: " + err.Error()
-		return
-	}
-	// 获取报告详情
-	reportInfo, err := models.GetReportByReportId(reportChapterInfo.ReportId)
-	if err != nil {
-		br.Msg = "报告信息有误"
-		br.ErrMsg = "报告信息有误, Err: " + err.Error()
-		return
-	}
-	if reportInfo.State == 2 {
-		br.Msg = "该报告已发布，不允许编辑"
-		br.ErrMsg = "该报告已发布，不允许编辑"
-		return
-	}
-
-	err, errMsg := services.EditChapterBaseInfoAndPermission(reportInfo, reportChapterInfo, req.Title, req.PermissionIdList, req.AdminIdList)
-	if err != nil {
-		br.Msg = "保存失败"
-		if errMsg != "" {
-			br.Msg = errMsg
-		}
-		br.ErrMsg = "保存失败,Err:" + err.Error()
-		return
-	}
-
-	br.Ret = 200
-	br.Success = true
-	br.Msg = "保存成功"
-}
-
 // GetReportChapterList
 // @Title 获取报告章节列表
 // @Description 获取报告章节列表

controllers/report_v2.go

@@ -643,7 +643,7 @@ func (this *ReportController) Detail() {
 			}
 		}
 
-		item.Abstract = item.Title
+		//item.Abstract = item.Title
 	}
 	item.Content = html.UnescapeString(item.Content)
 	item.ContentSub = html.UnescapeString(item.ContentSub)

models/report_chapter.go

@@ -143,7 +143,6 @@ type EditReportChapterReq struct {
 	HeadImg        string `description:"报告头图地址"`
 	EndImg         string `description:"报告尾图地址"`
 	CanvasColor    string `description:"画布颜色"`
-	NeedSplice     int    `description:"是否拼接版头版位的标记，主要是为了兼容历史报告。0-不需要 1-需要"`
 	HeadResourceId int    `description:"版头资源ID"`
 	EndResourceId  int    `description:"版尾资源ID"`
 }

services/report_v2.go

@@ -423,6 +423,7 @@ func getAddChapter(reportInfo *models.Report, minClassifyId, inheritReportId int
 			chapterItem.ReportCreateTime = time.Now()
 		} else {
 			chapterItem.AddType = 1
+			chapterItem.Title = typeItem.ReportChapterTypeName
 			//chapterItem.ReportType = reportType
 			chapterItem.ClassifyIdFirst = reportInfo.ClassifyIdFirst
 			chapterItem.ClassifyNameFirst = reportInfo.ClassifyNameFirst