Merge branch 'debug' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/help_doc/doc.go

@@ -44,7 +44,7 @@ func (this *HelpDocController) Add() {
 		br.ErrMsg = "参数解析失败，Err:" + err.Error()
 		return
 	}
-	fmt.Println("Id:",req.Id)
+	fmt.Println("Id:", req.Id)
 	if req.Content == "" {
 		br.Msg = "请输入内容"
 		return
@@ -227,11 +227,28 @@ func (this *HelpDocController) ListReport() {
 	}
 
 	if len(classifyIds) > 0 {
-		classifyIdSlice := strings.Split(classifyIds,",")
+		classifyIdSlice := strings.Split(classifyIds, ",")
 		condition += ` AND classify_id IN ( ` + utils.GetOrmInReplace(len(classifyIdSlice)) + ` ) `
 		pars = append(pars, classifyIdSlice)
 	}
 
+	//拿到所有分类信息，显示路径用
+	classifyAll, err := help_doc.GetAllHelpDocClassify()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
+	}
+
+	parentMap := make(map[int]int)
+	classifyNameMap := make(map[int]string)
+	for _, v := range classifyAll {
+		classifyNameMap[v.ClassifyId] = v.ClassifyName
+		if v.ParentId != 0 {
+			parentMap[v.ClassifyId] = v.ParentId
+		}
+	}
+
 	total, err := help_doc.GetHelpDocListCount(condition, pars)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -281,7 +298,17 @@ func (this *HelpDocController) ListReport() {
 			Anchor:        anchor,
 			Recommend:     recommend,
 		}
-
+		if pid, ok := parentMap[respItem.ClassifyId]; ok {
+			pName := classifyNameMap[pid]
+			if ppid, ok := parentMap[pid]; ok {
+				ppName := classifyNameMap[ppid]
+				respItem.ClassifyName = ppName + "/" + pName + "/" + classifyNameMap[respItem.ClassifyId]
+			} else {
+				respItem.ClassifyName = pName + "/" + classifyNameMap[respItem.ClassifyId]
+			}
+		} else {
+			respItem.ClassifyName = classifyNameMap[respItem.ClassifyId]
+		}
 		resp.List = append(resp.List, &respItem)
 	}
 
@@ -399,4 +426,4 @@ func (this *HelpDocController) Delete() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "删除成功"
-}
+}

models/help_doc/classify.go

@@ -95,7 +95,6 @@ type HelpDocClassifyItems struct {
 	ParentId           int
 	Level              int    `description:"层级"`
 	Sort               int    `description:"排序字段，越小越靠前，默认值：10"`
-	SourceName         string `description:"来源名称"`
 	SysUserId          int    `description:"创建人id"`
 	SysUserRealName    string `description:"创建人姓名"`
 	VisibleBusinessIds string
@@ -232,3 +231,10 @@ func EditHelpDocClassifyVisible(classifyId int, visibleBusinessIds string) (err
 	_, err = o.Raw(sql, visibleBusinessIds, classifyId).Exec()
 	return
 }
+
+func GetAllHelpDocClassify() (items []*HelpDocClassifyItems, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM help_doc_classify `
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}

models/help_doc/help_doc.go

@@ -57,9 +57,10 @@ type AddHelpDocReq struct {
 }
 
 type AnchorList struct {
-	AnchorId string
-	Anchor   string
-	Child    []AnchorList
+	AnchorId   string
+	Anchor     string
+	AnchorName string
+	Child      []AnchorList
 }
 
 type RecommendList struct {
@@ -113,6 +114,7 @@ func GetHelpDocById(docId int) (item *HelpDocItem, err error) {
 type HelpDocResp struct {
 	Id            int             `orm:"column(id);pk"`
 	ClassifyId    int             // 分类id
+	ClassifyName  string          // 分类路径
 	Title         string          // 标题
 	Author        string          // 作者
 	CreateTime    string          // 创建时间
@@ -148,21 +150,21 @@ func GetHelpDocList(condition string, pars []interface{}, startSize, pageSize in
 }
 
 type HelpDocListResp struct {
-	List []*HelpDocResp
+	List         []*HelpDocResp
 	ClassifyName string
-	Paging *paging.PagingItem `description:"分页数据"`
+	Paging       *paging.PagingItem `description:"分页数据"`
 }
 
 type PublishReq struct {
-	DocId int
-	Status int  `description:"状态：1:未发布，2:已发布"`
+	DocId  int
+	Status int `description:"状态：1:未发布，2:已发布"`
 }
 
 // 发布报告
 func PublishHelpDocById(reportId, status int) (err error) {
 	o := orm.NewOrm()
 	sql := ``
-	if status == 1{
+	if status == 1 {
 		sql = `UPDATE help_doc SET status=1,publish_time=NULL,modify_time=NOW() WHERE id = ? `
 	} else {
 		sql = `UPDATE help_doc SET status=2,publish_time=now(),modify_time=NOW() WHERE id = ? `