fix

controllers/report_approve/report_approve.go

@@ -323,7 +323,15 @@ func (this *ReportApproveController) List() {
 		if v.ReportType == report_approve.FlowReportTypeEnglish {
 			t.ReportClassify = fmt.Sprintf("%s/%s/%s/%s", report_approve.FlowReportTypeMap[v.ReportType], enClassifyIdName[enRootIdMap[v.ClassifySecondId]], enClassifyIdName[v.ClassifyFirstId], enClassifyIdName[v.ClassifySecondId])
 		} else {
-			t.ReportClassify = fmt.Sprintf("%s/%s/%s", report_approve.FlowReportTypeMap[v.ReportType], cnClassifyIdName[v.ClassifyFirstId], cnClassifyIdName[v.ClassifySecondId])
+			//t.ReportClassify = fmt.Sprintf("%s/%s/%s", report_approve.FlowReportTypeMap[v.ReportType], cnClassifyIdName[v.ClassifyFirstId], cnClassifyIdName[v.ClassifySecondId])
+			reportClassify := fmt.Sprintf("%s/%s", report_approve.FlowReportTypeMap[v.ReportType], cnClassifyIdName[v.ClassifyFirstId])
+			if v.ClassifySecondId > 0 {
+				reportClassify = fmt.Sprintf("%s/%s", reportClassify, cnClassifyIdName[v.ClassifySecondId])
+			}
+			if v.ClassifyThirdId > 0 {
+				reportClassify = fmt.Sprintf("%s/%s", reportClassify, cnClassifyIdName[v.ClassifyThirdId])
+			}
+			t.ReportClassify = reportClassify
 		}
 		respList = append(respList, t)
 	}

controllers/report_approve/report_approve_flow.go

@@ -725,7 +725,7 @@ func (this *ReportApproveFlowController) ReportClassifyTree() {
 	} else {
 		resp = append(resp, &report_approve.ReportClassifyTreeItem{
 			ClassifyId:   report_approve.FlowReportTypeChinese,
-			ClassifyName: "研报列表",
+			ClassifyName: "研报",
 			Children:     cnTree,
 		}, &report_approve.ReportClassifyTreeItem{
 			ClassifyId:   report_approve.FlowReportTypeEnglish,

controllers/report_v2.go

@@ -126,9 +126,8 @@ func (this *ReportController) ListReport() {
 	switch filterReportType {
 	// 筛选报告类型，1：公共研报，2：共享研报，3：我的研报
 	case 1:
-		condition += ` AND a.is_public_publish = ? `
-		// TODO 临时使用，提测上线前得打开注释
-		//condition += `  AND a.state in (2,6) `
+		//condition += ` AND a.is_public_publish = ? `
+		condition += `  AND a.state in (2,6) `
 		pars = append(pars, 1)
 	case 3:
 		condition += ` AND a.admin_id = ? `
@@ -1116,8 +1115,6 @@ func (this *ReportController) EditLayoutImg() {
 	br.Data = resp
 }
 
-// TODO 修复历史报告的ES数据
-
 // init
 // @Description: 修复历史报告数据
 // @author: Roc
@@ -1125,6 +1122,7 @@ func (this *ReportController) EditLayoutImg() {
 func init() {
 	//fixApproveRecord()
 	//fixChapterPermission()
+	//fixReportEs()
 }
 
 // 修复研报审批数据
@@ -1164,8 +1162,6 @@ func fixApproveRecord() {
 	fmt.Println("审批数据修复完成")
 }
 
-// TODO 审批列表，分类三级展示
-
 // fixChapterPermission
 // @Description: 修复章节关联的品种权限
 // @author: Roc
@@ -1229,3 +1225,54 @@ func fixChapterPermission() {
 
 	return
 }
+
+// fixReportEs
+// @Description: 修复报告es数据
+// @author: Roc
+// @datetime 2024-06-20 18:08:34
+func fixReportEs() {
+
+	//reportInfo, err := models.GetReportByReportId(3941)
+	//if err != nil {
+	//	fmt.Println("查询信息失败，", err)
+	//	return
+	//}
+	//content := utils.TrimHtml(html.UnescapeString(reportInfo.Content))
+	//fmt.Println(content)
+	//
+	//fmt.Println("=========================")
+	//
+	//chapterInfo, err := models.GetReportChapterInfoById(9637)
+	//if err != nil {
+	//	fmt.Println("查询信息失败2，", err)
+	//	return
+	//}
+	//
+	//content = utils.TrimHtml(html.UnescapeString(chapterInfo.Content))
+	//fmt.Println(content)
+	//
+	//services.UpdateReportChapterEs(9637)
+	//return
+
+	var condition string
+	var pars []interface{}
+
+	condition += " AND state in (2,6) "
+	list, err := models.GetReportListV1(condition, pars, 0, 100000)
+	if err != nil {
+		fmt.Println("查询信息失败，", err)
+		return
+	}
+
+	num := len(list)
+	fmt.Println(num, "条待修复报告es数据")
+
+	for k, v := range list {
+		fmt.Println("剩余", num-k, "条")
+		services.UpdateReportEs(v.Id, 2)
+	}
+
+	fmt.Println("报告ES数据修复完成")
+
+	return
+}

models/report_approve/constant.go

@@ -8,7 +8,7 @@ const (
 )
 
 var FlowReportTypeMap = map[int]string{
-	FlowReportTypeChinese: "中文研报",
+	FlowReportTypeChinese: "研报",
 	FlowReportTypeEnglish: "英文研报",
 	FlowReportTypeSmart:   "智能研报",
 }

models/report_approve/report_approve.go

@@ -261,6 +261,7 @@ type ReportApproveItemOrm struct {
 	ReportTitle           string    `description:"报告标题"`
 	ClassifyFirstId       int       `description:"一级分类ID"`
 	ClassifySecondId      int       `description:"二级分类ID"`
+	ClassifyThirdId       int       `description:"二级分类ID"`
 	State                 int       `description:"审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回"`
 	RecordState           int       `description:"审批记录状态：1-待审批；2-已通过；3-已驳回"`
 	FlowId                int       `description:"审批流ID"`

services/report.go

@@ -389,12 +389,13 @@ func updateReportChapterEsByChapter(chapterInfo *models.ReportChapter) (err erro
 	aliasArr, _ := addCategoryAliasToArr(categoryArr)
 	categories := strings.Join(aliasArr, ",")
 	// 新增/编辑ES
+
 	esChapter := &models.ElasticReportDetail{
 		ReportId:           chapterInfo.ReportId,
 		ReportChapterId:    chapterInfo.ReportChapterId,
 		Title:              chapterInfo.Title,
 		Abstract:           chapterInfo.Abstract,
-		BodyContent:        utils.TrimHtml(html.EscapeString(chapterInfo.Content)),
+		BodyContent:        utils.TrimHtml(html.UnescapeString(chapterInfo.Content)),
 		PublishTime:        chapterInfo.PublishTime.Format(utils.FormatDateTime),
 		PublishState:       chapterInfo.PublishState,
 		Author:             chapterInfo.Author,