Merge branch 'yb/5.2' into debug

controllers/yb/community_question_comment.go

@@ -0,0 +1,132 @@
+package yb
+
+import (
+	"encoding/json"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"hongze/hongze_mobile_admin/controllers"
+	ybRequest "hongze/hongze_mobile_admin/models/request/yb"
+	ybResponse "hongze/hongze_mobile_admin/models/response/yb"
+	"hongze/hongze_mobile_admin/services/yb"
+	"hongze/hongze_mobile_admin/utils"
+)
+
+type CommunityQuestionCommentController struct {
+	controllers.BaseAuth
+}
+
+// List
+// @Title 获取问答评论列表
+// @Description 获取问答评论列表
+// @Param   CommunityQuestionCommentId	query	int		false	"评论id"
+// @Param   HotStatus	query	int		false	"精选状态 -1:全部 0-未精选，1-已精选"
+// @Param   Keyword	query	string	false	"关键字搜索"
+// @Success 200 {object} yb.CommunityQuestionCommentListResp
+// @router /community/question/comment/list [get]
+func (c *CommunityQuestionCommentController) List() {
+	sysUser := c.AdminWx
+
+	// 权限校验
+	msg, err := yb.CheckCommunityQuestionPermission(sysUser.AdminId)
+	if err != nil {
+		c.FailWithMessage(msg, err.Error())
+		return
+	}
+
+	condition := ""
+	pars := make([]interface{}, 0)
+
+	//问答id
+	communityQuestionCommentId, _ := c.GetInt("CommunityQuestionCommentId", 0)
+	if communityQuestionCommentId > 0 {
+		condition += ` AND a.community_question_comment_id = ? `
+		pars = append(pars, communityQuestionCommentId)
+	} else {
+		//精选状态状态
+		hotStatus, _ := c.GetInt("HotStatus", 0)
+		if hotStatus >= 0 {
+			condition += ` AND a.is_hot = ? `
+			pars = append(pars, hotStatus)
+		}
+		//关键字
+		keyword := c.GetString("Keyword", "")
+		if keyword != "" {
+			condition += ` AND a.content like  "%` + keyword + `%"`
+		}
+	}
+
+	var startSize int
+	pageSize, _ := c.GetInt("PageSize")
+	currentIndex, _ := c.GetInt("CurrentIndex")
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = paging.StartIndex(currentIndex, pageSize)
+
+	total, list, err := yb.GetCommunityQuestionCommentList(condition, pars, startSize, pageSize)
+	if err != nil {
+		c.FailWithMessage("获取问答列表失败", "QuestionList ErrMsg:"+err.Error())
+		return
+	}
+
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	c.OkDetailed(ybResponse.CommunityQuestionCommentListResp{
+		Paging: page,
+		List:   list,
+	}, "获取成功")
+}
+
+// Delete
+// @Title 删除评论
+// @Description 删除评论
+// @Param   QuestionId	query	int	false	"问题ID"
+// @Success 200 string "操作成功"
+// @router /community/question/comment/delete [post]
+func (c *CommunityQuestionCommentController) Delete() {
+	sysUser := c.AdminWx
+	// 权限校验
+	msg, err := yb.CheckCommunityQuestionPermission(sysUser.AdminId)
+	if err != nil {
+		c.FailWithMessage(msg, err.Error())
+		return
+	}
+
+	var req ybRequest.QuestionCommentDeleteReq
+	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &req); err != nil {
+		c.FailWithMessage("参数解析异常!", "参数解析失败，Err:"+err.Error())
+		return
+	}
+	if err, errMsg := yb.SoftDeleteQuestionComment(req.CommunityQuestionCommentId); err != nil {
+		c.FailWithMessage(errMsg, "DeleteQuestion，Err:"+err.Error())
+		return
+	}
+	c.OkWithMessage("删除成功")
+}
+
+// Hot
+// @Title 设置/取消 问题评论精选
+// @Description 设置/取消 问题评论精选
+// @Success 200 string "操作成功"
+// @router /community/question/comment/hot [post]
+func (c *CommunityQuestionCommentController) Hot() {
+	sysUser := c.AdminWx
+	// 权限校验
+	msg, err := yb.CheckCommunityQuestionPermission(sysUser.AdminId)
+	if err != nil {
+		c.FailWithMessage(msg, err.Error())
+		return
+	}
+
+	var req ybRequest.QuestionCommentHotReq
+	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &req); err != nil {
+		c.FailWithMessage("参数解析异常!", "参数解析失败，Err:"+err.Error())
+		return
+	}
+	if err, errMsg := yb.SetHotQuestionComment(req.CommunityQuestionCommentId); err != nil {
+		c.FailWithMessage(errMsg, "DeleteQuestion，Err:"+err.Error())
+		return
+	}
+	c.OkWithMessage("操作成功")
+}

models/db_init.go

@@ -8,7 +8,6 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/admin_record"
 	"hongze/hongze_mobile_admin/models/tables/approval_flow"
 	"hongze/hongze_mobile_admin/models/tables/approval_flow_node"
-	"hongze/hongze_mobile_admin/models/tables/community_question"
 	"hongze/hongze_mobile_admin/models/tables/company"
 	"hongze/hongze_mobile_admin/models/tables/company_approval"
 	"hongze/hongze_mobile_admin/models/tables/company_approval_message"
@@ -40,6 +39,8 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/variety_tag"
 	"hongze/hongze_mobile_admin/models/tables/wx_token"
 	"hongze/hongze_mobile_admin/models/tables/wx_user"
+	"hongze/hongze_mobile_admin/models/tables/yb_community_question"
+	"hongze/hongze_mobile_admin/models/tables/yb_community_question_comment"
 	"hongze/hongze_mobile_admin/models/tables/yb_price_driven_tag"
 	"hongze/hongze_mobile_admin/utils"
 	"time"
@@ -119,7 +120,8 @@ func init() {
 // initCommunity 社区问答相关
 func initCommunity() {
 	orm.RegisterModel(
-		new(community_question.CommunityQuestion), //社区问答
+		new(yb_community_question.CommunityQuestion),                  //社区问答
+		new(yb_community_question_comment.YbCommunityQuestionComment), //社区问答评论
 	)
 }
 

models/request/yb/community_question_comment.go

@@ -0,0 +1,11 @@
+package yb
+
+// QuestionCommentDeleteReq 删除问答评论请求
+type QuestionCommentDeleteReq struct {
+	CommunityQuestionCommentId int `description:"问题评论ID"`
+}
+
+// QuestionCommentHotReq 设置/取消 精选问答评论请求
+type QuestionCommentHotReq struct {
+	CommunityQuestionCommentId int `description:"问题评论ID"`
+}

models/response/yb/community_question.go

@@ -2,6 +2,7 @@ package yb
 
 import (
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"time"
 )
 
 type CommunityQuestionListResp struct {
@@ -68,3 +69,32 @@ type QuestionClickLogListResp struct {
 	Count           int
 	QuestionContent string `description:"问题描述"`
 }
+
+// CommunityQuestionCommentListResp 研报评论列表数据返回
+type CommunityQuestionCommentListResp struct {
+	Paging *paging.PagingItem
+	List   []*CommunityQuestionCommentItem `description:"列表数据"`
+	//Count  *CommunityQuestionCount
+}
+
+// CommunityQuestionCommentItem 研报评论列表数据
+type CommunityQuestionCommentItem struct {
+	CommunityQuestionCommentId uint64    `orm:"column(community_question_comment_id);pk;" description:"留言ID"`
+	CommunityQuestionId        int       `orm:"column(community_question_id)" description:"社区问答id"`
+	UserId                     uint64    `orm:"column(user_id)" description:"用户id"`
+	Content                    string    `orm:"column(content)" description:"留言内容"`
+	IsTop                      int8      `orm:"column(is_top)" description:"是否置顶（0-未置顶，1-置顶）"`
+	IsHot                      int8      `orm:"column(is_hot)" description:"是否设置精选（0-未设置，1-已设置）"`
+	HotTopTime                 time.Time `orm:"column(hot_top_time)" description:"设置精选或者设置置顶的时间"`
+	IsShowName                 int8      `orm:"column(is_show_name)" description:"是否匿名 0-匿名，1-不匿名"`
+	SourceAgent                int       `orm:"column(source_agent)" description:"留言入口来源，1：小程序，2：小程序pc, 4：web pc"`
+	TopTime                    time.Time `orm:"column(top_time)" description:"设置置顶的时间"`
+	HotTime                    time.Time `orm:"column(hot_time)" description:"设置精选的时间"`
+	ModifyTime                 time.Time `orm:"column(modify_time)" description:"修改时间"`
+	CreateTime                 time.Time `orm:"column(create_time)" description:"创建时间"`
+	QuestionContent            string    `description:"问题内容"`
+	CompanyId                  int       `description:"客户id"`
+	UserName                   string    `description:"评论人名称"`
+	CompanyName                string    `description:"客户名称"`
+	CompanyProductStatus       string    `description:"客户ficc状态"`
+}

models/tables/wx_user/wx_user.go

@@ -61,3 +61,22 @@ func GetWxUserByCompanyIdAndMobile(companyId int, mobile string) (item *WxUser,
 	err = o.Raw(sql, companyId, mobile).QueryRow(&item)
 	return
 }
+
+// UserCompanyInfoList 联系人和客户信息表
+type UserCompanyInfoList struct {
+	UserId               int    `description:"联系人id"`
+	CompanyId            int    `description:"客户id"`
+	RealName             string `description:"联系人真实姓名"`
+	CompanyName          string `description:"客户名称"`
+	CompanyProductStatus string `description:"客户ficc状态"`
+}
+
+// GetUserListByUserIds 获取所有的用户openid列表
+func GetUserListByUserIds(userIds string) (items []*UserCompanyInfoList, err error) {
+	sql := `SELECT a.user_id,a.real_name,b.company_name,c.status company_product_status FROM wx_user AS a 
+          INNER JOIN company AS b ON b.company_id = a.company_id 
+          INNER JOIN company_product AS c ON b.company_id=c.company_id
+          WHERE a.user_id in ( ` + userIds + `) and c.product_id=1 `
+	_, err = orm.NewOrm().Raw(sql).QueryRows(&items)
+	return
+}

models/tables/community_question/community_question.go → models/tables/yb_community_question/yb_community_question.go

@@ -1,4 +1,4 @@
-package community_question
+package yb_community_question
 
 import (
 	"github.com/beego/beego/v2/client/orm"
@@ -98,3 +98,12 @@ func DeleteQuestion(questionId int) (err error) {
 	_, err = o.Raw(sql, questionId).Exec()
 	return
 }
+
+// GetCommunityQuestionListByIds 根据问答id获取列表数据
+func GetCommunityQuestionListByIds(CommunityQuestionIds string) (list []*CommunityQuestion, err error) {
+	o := orm.NewOrm()
+	// 列表数据
+	sql := `SELECT q.* FROM yb_community_question q WHERE q.is_deleted = 0 AND community_question_id in (` + CommunityQuestionIds + `)`
+	_, err = o.Raw(sql).QueryRows(&list)
+	return
+}

models/tables/yb_community_question_comment/yb_community_question_comment.go

@@ -0,0 +1,81 @@
+package yb_community_question_comment
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+// YbCommunityQuestionComment 研报问答社区 用户留言表
+type YbCommunityQuestionComment struct {
+	CommunityQuestionCommentId uint64    `orm:"column(community_question_comment_id);pk;" description:"留言ID"`
+	CommunityQuestionId        int       `orm:"column(community_question_id)" description:"社区问答id"`
+	UserId                     uint64    `orm:"column(user_id)" description:"用户id"`
+	Content                    string    `orm:"column(content)" description:"留言内容"`
+	ReplyCommentId             uint64    `orm:"column(reply_comment_id)" description:"回复的留言ID"`
+	IsTop                      int8      `orm:"column(is_top)" description:"是否置顶（0-未置顶，1-置顶）"`
+	IsHot                      int8      `orm:"column(is_hot)" description:"是否设置精选（0-未设置，1-已设置）"`
+	HotTopTime                 time.Time `orm:"column(hot_top_time)" description:"设置精选或者设置置顶的时间"`
+	Type                       int8      `orm:"column(type)" description:"留言类型 1-评论 2-回复"`
+	Enabled                    int8      `orm:"column(enabled)" description:"是否有效, 0-无效留言 1-有效留言"`
+	IsShowName                 int8      `orm:"column(is_show_name)" description:"是否匿名 0-匿名，1-不匿名"`
+	SourceAgent                int       `orm:"column(source_agent)" description:"留言入口来源，1：小程序，2：小程序pc, 4：web pc"`
+	TopTime                    time.Time `orm:"column(top_time)" description:"设置置顶的时间"`
+	HotTime                    time.Time `orm:"column(hot_time)" description:"设置精选的时间"`
+	ModifyTime                 time.Time `orm:"column(modify_time)" description:"修改时间"`
+	CreateTime                 time.Time `orm:"column(create_time)" description:"创建时间"`
+}
+
+// GetQuestionCommentById 主键获取提问评论
+func GetQuestionCommentById(questionId int) (item *YbCommunityQuestionComment, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM yb_community_question_comment WHERE community_question_comment_id = ? AND enabled = 1 LIMIT 1`
+	err = o.Raw(sql, questionId).QueryRow(&item)
+	return
+}
+
+//Update 更新评论信息
+func (item *YbCommunityQuestionComment) Update(cols []string) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Update(item, cols...)
+	return
+}
+
+// YbCommunityQuestionCommentAndQuestion 研报问答社区和信息
+type YbCommunityQuestionCommentAndQuestion struct {
+	CommunityQuestionCommentId uint64    `orm:"column(community_question_comment_id);pk;" description:"留言ID"`
+	CommunityQuestionId        int       `orm:"column(community_question_id)" description:"社区问答id"`
+	UserId                     uint64    `orm:"column(user_id)" description:"用户id"`
+	Content                    string    `orm:"column(content)" description:"留言内容"`
+	ReplyCommentId             uint64    `orm:"column(reply_comment_id)" description:"回复的留言ID"`
+	IsTop                      int8      `orm:"column(is_top)" description:"是否置顶（0-未置顶，1-置顶）"`
+	IsHot                      int8      `orm:"column(is_hot)" description:"是否设置精选（0-未设置，1-已设置）"`
+	HotTopTime                 time.Time `orm:"column(hot_top_time)" description:"设置精选或者设置置顶的时间"`
+	Type                       int8      `orm:"column(type)" description:"留言类型 1-评论 2-回复"`
+	Enabled                    int8      `orm:"column(enabled)" description:"是否有效, 0-无效留言 1-有效留言"`
+	IsShowName                 int8      `orm:"column(is_show_name)" description:"是否匿名 0-匿名，1-不匿名"`
+	SourceAgent                int       `orm:"column(source_agent)" description:"留言入口来源，1：小程序，2：小程序pc, 4：web pc"`
+	TopTime                    time.Time `orm:"column(top_time)" description:"设置置顶的时间"`
+	HotTime                    time.Time `orm:"column(hot_time)" description:"设置精选的时间"`
+	ModifyTime                 time.Time `orm:"column(modify_time)" description:"修改时间"`
+	CreateTime                 time.Time `orm:"column(create_time)" description:"创建时间"`
+	QuestionContent            string    `description:"问题内容"`
+}
+
+// GetCommunityQuestionCommentList 获取问答列表
+func GetCommunityQuestionCommentList(condition string, pars []interface{}, startSize, pageSize int) (total int, list []*YbCommunityQuestionCommentAndQuestion, err error) {
+	o := orm.NewOrm()
+
+	//汇总数据
+	totalSQl := `SELECT COUNT(1) total FROM yb_community_question_comment a join yb_community_question b on a.community_question_id = b.community_question_id WHERE a.enabled = 1 and b.is_deleted=0 `
+	totalSQl += condition
+	if err = o.Raw(totalSQl, pars).QueryRow(&total); err != nil {
+		return
+	}
+
+	// 列表数据
+	sql := `SELECT a.*,b.question_content FROM yb_community_question_comment a join yb_community_question b on a.community_question_id = b.community_question_id WHERE a.enabled = 1 and b.is_deleted=0 `
+	sql += condition
+	sql += ` ORDER BY a.create_time DESC LIMIT ?,?`
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	return
+}

routers/commentsRouter.go

@@ -178,6 +178,33 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/yb:CommunityQuestionCommentController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/yb:CommunityQuestionCommentController"],
+        beego.ControllerComments{
+            Method: "Delete",
+            Router: `/community/question/comment/delete`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/yb:CommunityQuestionCommentController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/yb:CommunityQuestionCommentController"],
+        beego.ControllerComments{
+            Method: "Hot",
+            Router: `/community/question/comment/hot`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/yb:CommunityQuestionCommentController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/yb:CommunityQuestionCommentController"],
+        beego.ControllerComments{
+            Method: "List",
+            Router: `/community/question/comment/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/yb:CommunityQuestionController"] = append(beego.GlobalControllerRouter["hongze/hongze_mobile_admin/controllers/yb:CommunityQuestionController"],
         beego.ControllerComments{
             Method: "QuestionDelete",

routers/router.go

@@ -85,6 +85,7 @@ func init() {
 		web.NSNamespace("/yb",
 			web.NSInclude(
 				&yb.CommunityQuestionController{},
+				&yb.CommunityQuestionCommentController{},
 			),
 		),
 		web.NSNamespace("/taglib",

services/yb/community_question.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	ybResponse "hongze/hongze_mobile_admin/models/response/yb"
 	"hongze/hongze_mobile_admin/models/tables/admin"
-	"hongze/hongze_mobile_admin/models/tables/community_question"
 	"hongze/hongze_mobile_admin/models/tables/company"
 	"hongze/hongze_mobile_admin/models/tables/sys_role"
 	"hongze/hongze_mobile_admin/models/tables/sys_role_admin"
@@ -13,6 +12,7 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/variety_classify"
 	"hongze/hongze_mobile_admin/models/tables/variety_tag"
 	"hongze/hongze_mobile_admin/models/tables/wx_user"
+	"hongze/hongze_mobile_admin/models/tables/yb_community_question"
 	"hongze/hongze_mobile_admin/services"
 	"hongze/hongze_mobile_admin/services/alarm_msg"
 	"hongze/hongze_mobile_admin/utils"
@@ -24,7 +24,7 @@ import (
 // GetQuestionList 问题列表
 func GetQuestionList(condition string, pars []interface{}, startSize, pageSize int) (total int, resp *ybResponse.CommunityQuestionListResp, err error) {
 	resp = new(ybResponse.CommunityQuestionListResp)
-	total, list, e := community_question.GetCommunityQuestionList(condition, pars, startSize, pageSize)
+	total, list, e := yb_community_question.GetCommunityQuestionList(condition, pars, startSize, pageSize)
 	if e != nil {
 		err = errors.New("获取问题列表失败 Err:" + e.Error())
 		return
@@ -94,7 +94,7 @@ func GetQuestionList(condition string, pars []interface{}, startSize, pageSize i
 		respList = append(respList, item)
 	}
 	// 数量统计
-	//countList, e := community_question.GetCommunityQuestionCount()
+	//countList, e := yb_community_question.GetCommunityQuestionCount()
 	//if e != nil {
 	//	err = errors.New("获取问题数量统计失败 Err:" + e.Error())
 	//	return
@@ -122,7 +122,7 @@ func GetQuestionList(condition string, pars []interface{}, startSize, pageSize i
 
 // GetQuestionCompanyUser 获取提问者详情
 func GetQuestionCompanyUser(questionId int) (ret *ybResponse.QuestionCompanyUser, err error) {
-	questionInfo, e := community_question.GetQuestionById(questionId)
+	questionInfo, e := yb_community_question.GetQuestionById(questionId)
 	if e != nil {
 		err = errors.New("提问信息有误 Err:" + e.Error())
 		return
@@ -154,7 +154,7 @@ func GetQuestionCompanyUser(questionId int) (ret *ybResponse.QuestionCompanyUser
 func DistributeQuestion(questionId, adminId, researchGroupFirstId, researchGroupSecondId, distributeId int) (errMsg string, err error) {
 	errMsg = "操作成功"
 	// 校验提问信息
-	item, e := community_question.GetQuestionById(questionId)
+	item, e := yb_community_question.GetQuestionById(questionId)
 	if e != nil {
 		errMsg = "分配失败, 提问信息有误"
 		err = errors.New("提问信息有误 Err:" + e.Error())
@@ -267,11 +267,11 @@ func DistributeQuestion(questionId, adminId, researchGroupFirstId, researchGroup
 
 // SoftDeleteQuestion 删除问题
 func SoftDeleteQuestion(questionId int) (err error) {
-	if _, e := community_question.GetQuestionById(questionId); e != nil {
+	if _, e := yb_community_question.GetQuestionById(questionId); e != nil {
 		err = errors.New("提问信息有误 Err:" + e.Error())
 		return
 	}
-	if e := community_question.DeleteQuestion(questionId); e != nil {
+	if e := yb_community_question.DeleteQuestion(questionId); e != nil {
 		err = errors.New("删除提问失败 Err:" + e.Error())
 	}
 	return
@@ -285,7 +285,7 @@ func SendMsgToReplier(questionId int) (errMsg string, err error) {
 		}
 	}()
 	errMsg = "推送成功"
-	item, e := community_question.GetQuestionById(questionId)
+	item, e := yb_community_question.GetQuestionById(questionId)
 	if e != nil {
 		errMsg = "问答信息有误"
 		err = errors.New("提问信息有误, Err:" + e.Error())
@@ -338,7 +338,7 @@ func SendMsgToReplier(questionId int) (errMsg string, err error) {
 
 // EditQuestion 编辑问题
 func EditQuestion(questionId int, content string) (errMsg string, err error) {
-	item, e := community_question.GetQuestionById(questionId)
+	item, e := yb_community_question.GetQuestionById(questionId)
 	if e != nil {
 		errMsg = "提问信息有误"
 		err = errors.New("提问信息有误 Err:" + e.Error())

services/yb/community_question_comment.go

@@ -0,0 +1,129 @@
+package yb
+
+import (
+	"errors"
+	"fmt"
+	ybResponse "hongze/hongze_mobile_admin/models/response/yb"
+	"hongze/hongze_mobile_admin/models/tables/wx_user"
+	"hongze/hongze_mobile_admin/models/tables/yb_community_question_comment"
+	"hongze/hongze_mobile_admin/utils"
+	"strings"
+	"time"
+)
+
+// GetCommunityQuestionCommentList 问答评论列表
+func GetCommunityQuestionCommentList(condition string, pars []interface{}, startSize, pageSize int) (total int, commentList []*ybResponse.CommunityQuestionCommentItem, err error) {
+	commentList = make([]*ybResponse.CommunityQuestionCommentItem, 0)
+	total, list, e := yb_community_question_comment.GetCommunityQuestionCommentList(condition, pars, startSize, pageSize)
+	if e != nil {
+		err = errors.New("获取问题列表失败 Err:" + e.Error())
+		return
+	}
+	if len(list) == 0 {
+		return
+	}
+	// 查找用户
+	userIdArr := make([]string, 0)
+	for _, v := range list {
+		userIdArr = append(userIdArr, fmt.Sprint(v.UserId))
+	}
+
+	//评论人信息
+	wxUserCompanyInfoMap := make(map[int]*wx_user.UserCompanyInfoList, 0)
+	if len(userIdArr) > 0 {
+		userIds := strings.Join(userIdArr, ",")
+		wxUserCompanyInfoList, tmpErr := wx_user.GetUserListByUserIds(userIds)
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+		for _, v := range wxUserCompanyInfoList {
+			wxUserCompanyInfoMap[v.UserId] = v
+		}
+	}
+
+	for _, v := range list {
+		item := &ybResponse.CommunityQuestionCommentItem{
+			CommunityQuestionCommentId: v.CommunityQuestionCommentId,
+			CommunityQuestionId:        v.CommunityQuestionId,
+			UserId:                     v.UserId,
+			Content:                    v.Content,
+			IsTop:                      v.IsTop,
+			IsHot:                      v.IsHot,
+			HotTopTime:                 v.HotTopTime,
+			IsShowName:                 v.IsShowName,
+			SourceAgent:                v.SourceAgent,
+			TopTime:                    v.TopTime,
+			HotTime:                    v.HotTime,
+			ModifyTime:                 v.ModifyTime,
+			CreateTime:                 v.CreateTime,
+			QuestionContent:            v.QuestionContent,
+			CompanyId:                  0,
+			UserName:                   "",
+			CompanyName:                "",
+			CompanyProductStatus:       "",
+		}
+
+		//评论人信息
+		if tmpWxUserCompanyInfo, ok := wxUserCompanyInfoMap[int(v.UserId)]; ok {
+			item.CompanyId = tmpWxUserCompanyInfo.CompanyId
+			item.UserName = tmpWxUserCompanyInfo.RealName
+			item.CompanyName = tmpWxUserCompanyInfo.CompanyName
+			item.CompanyProductStatus = tmpWxUserCompanyInfo.CompanyProductStatus
+		}
+
+		commentList = append(commentList, item)
+	}
+	return
+}
+
+// SoftDeleteQuestionComment 删除问题评论
+func SoftDeleteQuestionComment(questionCommentId int) (err error, errMsg string) {
+	errMsg = `删除成功`
+	questionCommentInfo, err := yb_community_question_comment.GetQuestionCommentById(questionCommentId)
+	if err != nil {
+		errMsg = "查找评论失败"
+		if err.Error() == utils.ErrNoRow() {
+			errMsg = "该评论不存在"
+		}
+		return
+	}
+
+	//标记删除
+	questionCommentInfo.Enabled = 0
+	questionCommentInfo.ModifyTime = time.Now()
+	err = questionCommentInfo.Update([]string{"Enabled", "ModifyTime"})
+	if err != nil {
+		errMsg = "删除提问失败"
+	}
+	return
+}
+
+// SetHotQuestionComment 设置/取消 问题评论精选
+func SetHotQuestionComment(questionCommentId int) (err error, errMsg string) {
+	errMsg = `操作失败`
+	questionCommentInfo, err := yb_community_question_comment.GetQuestionCommentById(questionCommentId)
+	if err != nil {
+		errMsg = "查找评论失败"
+		if err.Error() == utils.ErrNoRow() {
+			errMsg = "该评论不存在"
+		}
+		return
+	}
+
+	//var isHot int8
+	isHot := int8(1)
+	if questionCommentInfo.IsTop == 1 {
+		isHot = 0
+	}
+	//标记删除
+	questionCommentInfo.IsHot = isHot //是否设置精选（0-未设置，1-已设置）
+	questionCommentInfo.HotTopTime = time.Now()
+	questionCommentInfo.HotTime = time.Now()
+	questionCommentInfo.ModifyTime = time.Now()
+	err = questionCommentInfo.Update([]string{"IsHot", "HotTopTime", "HotTime", "ModifyTime"})
+	if err != nil {
+		errMsg = "操作失败"
+	}
+	return
+}