报告分类编辑接口

controller/eta/classify.go

@@ -7,7 +7,6 @@ import (
 	"hongze/hz_crm_eta/global"
 	"hongze/hz_crm_eta/models/crm"
 	"hongze/hz_crm_eta/models/eta"
-	eta2 "hongze/hz_crm_eta/services/eta"
 	"hongze/hz_crm_eta/utils"
 	"time"
 )
@@ -44,15 +43,18 @@ func (this *ClassifyController) ListClassify(c *gin.Context) {
 		resp.FailData("获取失败", err.Error(), c)
 		return
 	}
-
+	finalList := make([]*eta.ClassifyList, 0)
 	parentIds := make([]int, 0)
 	for i := range list {
+		tmp := new(eta.ClassifyList)
+		tmp.ClassifyListItem = *list[i]
+		finalList = append(finalList, tmp)
 		parentIds = append(parentIds, list[i].Id)
 	}
 	parentIdLen := len(parentIds)
 	if parentIdLen == 0 {
 		data := &eta.ClassifyListResp{
-			List: list,
+			List: finalList,
 		}
 		resp.OkData("操作成功", data, c)
 		return
@@ -62,7 +64,7 @@ func (this *ClassifyController) ListClassify(c *gin.Context) {
 	menuListMap := make(map[int][]*eta.ClassifyMenu, 0)
 	var menuCond string
 	var menuPars []interface{}
-	menuCond += ` classify_id IN (` + utils.GetOrmInReplace(parentIdLen) + `)`
+	menuCond += ` classify_id IN (?)`
 	menuPars = append(menuPars, parentIds)
 	menuOb := new(eta.ClassifyMenu)
 	parentMenus, e := menuOb.GetClassifyMenuList(menuCond, menuPars)
@@ -94,7 +96,7 @@ func (this *ClassifyController) ListClassify(c *gin.Context) {
 	if childrenIdsLen > 0 {
 		var relateCond string
 		var relatePars []interface{}
-		relateCond += ` classify_id IN (` + utils.GetOrmInReplace(childrenIdsLen) + `)`
+		relateCond += ` classify_id IN (?)`
 		relatePars = append(relatePars, childrenIds)
 		menuRelationOb := new(eta.ClassifyMenuRelation)
 		relates, e := menuRelationOb.GetClassifyMenuRelationList(relateCond, relatePars)
@@ -137,13 +139,13 @@ func (this *ClassifyController) ListClassify(c *gin.Context) {
 	}
 
 	// 一级分类
-	for i := range list {
-		list[i].ClassifyMenuList = menuListMap[list[i].Id]
-		list[i].Child = childrenMap[list[i].Id]
+	for i := range finalList {
+		finalList[i].ClassifyMenuList = menuListMap[list[i].Id]
+		finalList[i].Child = childrenMap[list[i].Id]
 	}
 
 	data := new(eta.ClassifyListResp)
-	data.List = list
+	data.List = finalList
 	resp.OkData("操作成功", data, c)
 }
 
@@ -219,7 +221,7 @@ func (this *ClassifyController) Edit(c *gin.Context) {
 	}
 	// 获取系统菜单, 如果没有对应的字段的特殊处理项, 则忽略必填
 	sysMenuObject := new(eta.SysMenu)
-	menus, e := sysMenuObject.GetSysMenuItemsByCondition(` AND hidden = 0`, make([]interface{}, 0), []string{}, ``)
+	menus, e := sysMenuObject.GetSysMenuItemsByCondition(` hidden = 0`, make([]interface{}, 0), []string{}, ``)
 	if e != nil {
 		resp.FailData("保存失败", "获取菜单列表失败, Err:"+err.Error(), c)
 		return
@@ -262,7 +264,7 @@ func (this *ClassifyController) Edit(c *gin.Context) {
 	}
 	//originRelateTel := item.RelateTel
 	item.ModifyTime = time.Now().Local()
-	item.Abstract = req.Abstract
+	/*item.Abstract = req.Abstract
 	item.Descript = req.Descript
 	item.ReportAuthor = req.ReportAuthor
 	item.AuthorDescript = req.AuthorDescript
@@ -270,11 +272,11 @@ func (this *ClassifyController) Edit(c *gin.Context) {
 	item.HeadImgUrl = req.HeadImgUrl
 	item.AvatarImgUrl = req.AvatarImgUrl
 	item.ReportImgUrl = req.ReportImgUrl
-	item.HomeImgUrl = req.HomeImgUrl
+	item.HomeImgUrl = req.HomeImgUrl*/
 	item.ClassifyLabel = req.ClassifyLabel
 	item.ShowType = req.ShowType
-	item.HasTeleconference = req.HasTeleconference
-	item.VipTitle = req.VipTitle
+	/*	item.HasTeleconference = req.HasTeleconference
+		item.VipTitle = req.VipTitle*/
 	//	item.Sort = req.Sort
 	item.IsShow = req.IsShow
 	item.YbFiccSort = req.YbFiccSort
@@ -289,8 +291,11 @@ func (this *ClassifyController) Edit(c *gin.Context) {
 	item.RelateVideo = req.RelateVideo
 	item.ModifyTime = time.Now().Local()
 	cols := make([]string, 0)
-	cols = append(cols, "Abstract", "Descript", "ReportAuthor", "AuthorDescript", "ColumnImgUrl",
-		"HeadImgUrl", "AvatarImgUrl", "ReportImgUrl", "HomeImgUrl", "ClassifyLabel", "ShowType", "HasTeleconference", "VipTitle",
+	/*cols = append(cols, "Abstract", "Descript", "ReportAuthor", "AuthorDescript", "ColumnImgUrl",
+	"HeadImgUrl", "AvatarImgUrl", "ReportImgUrl", "HomeImgUrl", "ClassifyLabel", "ShowType", "HasTeleconference", "VipTitle",
+	"IsShow", "YbFiccSort", "YbFiccIcon", "YbFiccPcIcon", "YbIconUrl", "YbBgUrl", "YbListImg", "YbShareBgImg", "YbRightBanner",
+	"RelateTel", "RelateVideo", "ModifyTime")*/
+	cols = append(cols, "ClassifyLabel", "ShowType",
 		"IsShow", "YbFiccSort", "YbFiccIcon", "YbFiccPcIcon", "YbIconUrl", "YbBgUrl", "YbListImg", "YbShareBgImg", "YbRightBanner",
 		"RelateTel", "RelateVideo", "ModifyTime")
 	if e = item.UpdateClassify(cols); e != nil {
@@ -306,11 +311,11 @@ func (this *ClassifyController) Edit(c *gin.Context) {
 	}
 
 	// 为二级分类时, 更新父级分类是否含电话会字段
-	if item.ParentId > 0 {
+	/*if item.ParentId > 0 {
 		go func() {
 			_ = eta2.UpdateParentClassifyHasTel(req.ClassifyId, item.ParentId, req.HasTeleconference)
 		}()
-	}
+	}*/
 
 	// 获取编辑前子目录列表
 	classifyId := item.Id

init_serve/router.go

@@ -21,5 +21,6 @@ func InitRouter() (r *gin.Engine) {
 	routers.InitEtaTrial(rBase)
 	routers.InitChartPermission(rBase)
 	routers.InitReportChapterType(rBase)
+	routers.InitReportClassify(rBase)
 	return
 }

models/eta/classify.go

@@ -46,8 +46,8 @@ func (c *Classify) TableName() string {
 	return "classify"
 }
 
-type ClassifyList struct {
-	Id                int       `orm:"column(id);pk"`
+type ClassifyListItem struct {
+	Id                int       `description:"id"`
 	ClassifyName      string    `description:"分类名称"`
 	Sort              int       `description:"排序"`
 	ParentId          int       `description:"父级分类id"`
@@ -70,10 +70,13 @@ type ClassifyList struct {
 	RelateTel         int       `description:"是否在电话会中可选: 0-否; 1-是"`
 	RelateVideo       int       `description:"是否在路演视频中可选: 0-否; 1-是"`
 	Enabled           int       `description:"是否可用，1可用，0禁用"`
-	Child             []*ClassifyItem
-	ClassifyMenuList  []*ClassifyMenu
 }
 
+type ClassifyList struct {
+	ClassifyListItem
+	Child            []*ClassifyItem
+	ClassifyMenuList []*ClassifyMenu
+}
 type ClassifyItem struct {
 	Classify
 	ClassifyMenuId        int `description:"二级分类-子目录ID"`
@@ -82,7 +85,7 @@ type ClassifyItem struct {
 }
 
 // 获取分类列表
-func GetClassifyList(keyWord, companyType string, hideDayWeek int) (items []*ClassifyList, err error) {
+func GetClassifyList(keyWord, companyType string, hideDayWeek int) (items []*ClassifyListItem, err error) {
 	sql := ``
 	companyTypeSqlStr := ``
 	if companyType == "ficc" {
@@ -123,10 +126,10 @@ func GetClassifyChildByParentIds(parentId []int, keyWord string) (items []*Class
 	pars := make([]interface{}, 0)
 	pars = append(pars, parentId)
 	if keyWord != "" {
-		sql = `SELECT * FROM classify WHERE parent_id IN (` + utils.GetOrmInReplace(parentIdLen) + `) AND classify_name LIKE ? ORDER BY create_time ASC `
+		sql = `SELECT * FROM classify WHERE parent_id IN (?) AND classify_name LIKE ? ORDER BY create_time ASC `
 		pars = append(pars, utils.GetLikeKeyword(keyWord))
 	} else {
-		sql = `SELECT * FROM classify WHERE parent_id IN (` + utils.GetOrmInReplace(parentIdLen) + `) ORDER BY create_time ASC `
+		sql = `SELECT * FROM classify WHERE parent_id IN (?) ORDER BY create_time ASC `
 	}
 	err = global.MYSQL["rddp"].Raw(sql, pars...).Scan(&items).Error
 	return
@@ -190,34 +193,35 @@ func (c *Classify) GetClassifyById(classifyId int) (item *Classify, err error) {
 }
 
 type EditClassifyReq struct {
-	ClassifyId        int                    `description:"分类ID"`
-	Abstract          string                 `description:"栏目简介"`
-	Descript          string                 `description:"分享描述"`
-	ReportAuthor      string                 `description:"栏目作者"`
-	AuthorDescript    string                 `description:"作者简介"`
-	ColumnImgUrl      string                 `description:"栏目配图"`
-	ReportImgUrl      string                 `description:"报告配图"`
-	HeadImgUrl        string                 `description:"头部banner"`
-	AvatarImgUrl      string                 `description:"头像"`
-	HomeImgUrl        string                 `description:"首页配图"`
-	ClassifyLabel     string                 `description:"分类标签"`
-	ShowType          int                    `description:"展示类型：1-列表 2-专栏"`
-	HasTeleconference int                    `description:"是否有电话会：0-否 1-是"`
-	VipTitle          string                 `description:"研究员头衔"`
-	Sort              int                    `description:"后台排序"`
-	IsShow            int                    `description:"是否在小程序显示：1-显示 0-隐藏"`
-	YbFiccSort        int                    `description:"小程序FICC页排序"`
-	YbFiccIcon        string                 `description:"小程序FICC页icon"`
-	YbFiccPcIcon      string                 `description:"小程序PC端FICC页背景图"`
-	YbIconUrl         string                 `description:"小程序已购页icon"`
-	YbBgUrl           string                 `description:"小程序已购详情背景图"`
-	YbListImg         string                 `description:"小程序研报列表封面图"`
-	YbShareBgImg      string                 `description:"小程序研报详情分享背景图"`
-	YbRightBanner     string                 `description:"Pc端详情页，右侧，报告合集背景图"`
-	MenuList          []*ClassifyMenuSaveReq `description:"子目录列表"`
-	ClassifyMenuId    int                    `description:"二级分类-子目录ID"`
-	RelateTel         int                    `description:"是否在电话会中可选: 0-否; 1-是"`
-	RelateVideo       int                    `description:"是否在路演视频中可选: 0-否; 1-是"`
+	ClassifyId int `description:"分类ID"`
+	/*Abstract          string `description:"栏目简介"`
+	Descript          string `description:"分享描述"`
+	ReportAuthor      string `description:"栏目作者"`
+	AuthorDescript    string `description:"作者简介"`
+	ColumnImgUrl      string `description:"栏目配图"`
+	ReportImgUrl      string `description:"报告配图"`
+	HeadImgUrl        string `description:"头部banner"`
+	AvatarImgUrl      string `description:"头像"`
+	HomeImgUrl        string `description:"首页配图"`
+	HasTeleconference int    `description:"是否有电话会：0-否 1-是"`
+	VipTitle          string `description:"研究员头衔"`*/
+	//Sort              int                    `description:"后台排序"`
+
+	ShowType       int                    `description:"展示类型：1-列表 2-专栏"`
+	MenuList       []*ClassifyMenuSaveReq `description:"子目录列表"`
+	ClassifyLabel  string                 `description:"分类标签"`
+	IsShow         int                    `description:"是否在小程序显示：1-显示 0-隐藏"`
+	YbFiccSort     int                    `description:"小程序FICC页排序"`
+	YbFiccIcon     string                 `description:"小程序FICC页icon"`
+	YbFiccPcIcon   string                 `description:"小程序PC端FICC页背景图"`
+	YbIconUrl      string                 `description:"小程序已购页icon"`
+	YbBgUrl        string                 `description:"小程序已购详情背景图"`
+	YbListImg      string                 `description:"小程序研报列表封面图"`
+	YbShareBgImg   string                 `description:"小程序研报详情分享背景图"`
+	YbRightBanner  string                 `description:"Pc端详情页，右侧，报告合集背景图"`
+	ClassifyMenuId int                    `description:"二级分类-子目录ID"`
+	RelateTel      int                    `description:"是否在电话会中可选: 0-否; 1-是"`
+	RelateVideo    int                    `description:"是否在路演视频中可选: 0-否; 1-是"`
 }
 
 // ClassifyMenuSaveReq 保存分类子目录请求体

models/eta/sys_menu.go

@@ -46,6 +46,6 @@ func (s *SysMenu) GetSysMenuItemsByCondition(condition string, pars []interface{
 	if orderRule != "" {
 		order = orderRule
 	}
-	err = global.MYSQL["hz_eta"].Select(s).Select(fields).Where(condition, pars...).Order(order).Scan(&items).Error
+	err = global.MYSQL["hz_eta"].Model(s).Select(fields).Where(condition, pars...).Order(order).Scan(&items).Error
 	return
 }